mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

string-list.h users: change to use *_{nodup,dup}()

Browse Source 
Change all in-tree users of the string_list_init(LIST, BOOL) API to
use string_list_init_{nodup,dup}(LIST) instead.

As noted in the preceding commit let's leave the now-unused
string_list_init() wrapper in-place for any in-flight users, it can be
removed at some later date.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2021-07-01 12:51:29 +02:00
committed by Junio C Hamano
parent 770fedaf9f
commit bc40dfb10a
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -121,7 +121,7 @@ static void dir_rename_entry_init(struct dir_rename_entry *entry,
entry->dir = directory;
entry->non_unique_new_dir = 0;
strbuf_init(&entry->new_dir, 0);
string_list_init(&entry->possible_new_dirs, 0);
string_list_init_nodup(&entry->possible_new_dirs);
}
struct collision_entry {
@ -3703,7 +3703,7 @@ static int merge_start(struct merge_options *opt, struct tree *head)
}
CALLOC_ARRAY(opt->priv, 1);
string_list_init(&opt->priv->df_conflict_file_set, 1);
string_list_init_dup(&opt->priv->df_conflict_file_set);
return 0;
}