summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-23 18:35:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-23 18:35:54 (GMT)
commit955d7be808b455cdf2eb60306a690958c3bb49ca (patch)
tree5dd47421f110812148213e64446361ac0656240a /merge-recursive.c
parentbc88defa2f9f92324106dca48126039246ab00e1 (diff)
parentf93d7c6fa0548e95ca2795d900671a87c1a88ea3 (diff)
downloadgit-955d7be808b455cdf2eb60306a690958c3bb49ca.zip
git-955d7be808b455cdf2eb60306a690958c3bb49ca.tar.gz
git-955d7be808b455cdf2eb60306a690958c3bb49ca.tar.bz2
Merge branch 'ta/string-list-init'
* ta/string-list-init: replace memset with string-list initializers string-list: add string_list initializer helper function
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 5814d05..1d332b8 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2059,12 +2059,9 @@ void init_merge_options(struct merge_options *o)
if (o->verbosity >= 5)
o->buffer_output = 0;
strbuf_init(&o->obuf, 0);
- memset(&o->current_file_set, 0, sizeof(struct string_list));
- o->current_file_set.strdup_strings = 1;
- memset(&o->current_directory_set, 0, sizeof(struct string_list));
- o->current_directory_set.strdup_strings = 1;
- memset(&o->df_conflict_file_set, 0, sizeof(struct string_list));
- o->df_conflict_file_set.strdup_strings = 1;
+ string_list_init(&o->current_file_set, 1);
+ string_list_init(&o->current_directory_set, 1);
+ string_list_init(&o->df_conflict_file_set, 1);
}
int parse_merge_opt(struct merge_options *o, const char *s)