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

Merge branch 'ta/string-list-init'

Browse Source 
* ta/string-list-init:
  replace memset with string-list initializers
  string-list: add string_list initializer helper function
This commit is contained in:
Junio C Hamano
2014-07-23 11:35:54 -07:00
parent bc88defa2f f93d7c6fa0
commit 955d7be808
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@ -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)