diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:53 -0700 |
commit | bd4232fac3319890429ec303e2f7c3d287c8eaa3 (patch) | |
tree | b5032aca9cdafb5812801f2868cabddc23e2052a /merge-recursive.c | |
parent | 832a239b72779e97b09943d77b9097ed8376e18e (diff) | |
parent | bc40dfb10a06612813a3f9b733d65af0732208b2 (diff) | |
download | git-bd4232fac3319890429ec303e2f7c3d287c8eaa3.tar.gz |
Merge branch 'ab/struct-init'
Code cleanup around struct_type_init() functions.
* ab/struct-init:
string-list.h users: change to use *_{nodup,dup}()
string-list.[ch]: add a string_list_init_{nodup,dup}()
dir.[ch]: replace dir_init() with DIR_INIT
*.c *_init(): define in terms of corresponding *_INIT macro
*.h: move some *_INIT to designated initializers
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 9a8a39f014..a67bf2acfa 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 { @@ -3710,7 +3710,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; } |