diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-07-17 00:42:52 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-17 00:42:53 (GMT) |
commit | bd4232fac3319890429ec303e2f7c3d287c8eaa3 (patch) | |
tree | b5032aca9cdafb5812801f2868cabddc23e2052a /merge-ort.c | |
parent | 832a239b72779e97b09943d77b9097ed8376e18e (diff) | |
parent | bc40dfb10a06612813a3f9b733d65af0732208b2 (diff) | |
download | git-bd4232fac3319890429ec303e2f7c3d287c8eaa3.zip git-bd4232fac3319890429ec303e2f7c3d287c8eaa3.tar.gz git-bd4232fac3319890429ec303e2f7c3d287c8eaa3.tar.bz2 |
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-ort.c')
-rw-r--r-- | merge-ort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index ddba1db..8cfa0cc 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1840,7 +1840,7 @@ static void compute_collisions(struct strmap *collisions, free(new_path); } else { CALLOC_ARRAY(collision_info, 1); - string_list_init(&collision_info->source_files, 0); + string_list_init_nodup(&collision_info->source_files); strmap_put(collisions, new_path, collision_info); } string_list_insert(&collision_info->source_files, @@ -4030,7 +4030,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result) */ strmap_init_with_options(&opt->priv->paths, NULL, 0); strmap_init_with_options(&opt->priv->conflicted, NULL, 0); - string_list_init(&opt->priv->paths_to_free, 0); + string_list_init_nodup(&opt->priv->paths_to_free); /* * keys & strbufs in output will sometimes need to outlive "paths", |