diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-07-01 10:51:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-01 19:32:22 (GMT) |
| commit | bc40dfb10a06612813a3f9b733d65af0732208b2 (patch) | |
| tree | 5b8b6a53a70365d72762b7181ed4bb108e6ffea4 /merge-recursive.c | |
| parent | 770fedaf9fb156bd8c18da41770eac0cb63fba63 (diff) | |
| download | git-bc40dfb10a06612813a3f9b733d65af0732208b2.zip git-bc40dfb10a06612813a3f9b733d65af0732208b2.tar.gz git-bc40dfb10a06612813a3f9b733d65af0732208b2.tar.bz2 | |
string-list.h users: change to use *_{nodup,dup}()
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d146bb1..be473f8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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; } |