kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/merge-recursive-string-list-init' 

A small code clean-up.

* rs/merge-recursive-string-list-init:
  merge-recursive: use STRING_LIST_INIT_NODUP
maint
Junio C Hamano 2016-08-12 09:47:36 -07:00
parent b32d7c524b af4941d444
commit 8a5ad2ba5b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge-recursive.c
View File

@ -436,7 +436,7 @@ static void record_df_conflict_files(struct merge_options *o,
* and the file need to be present, then the D/F file will be * and the file need to be present, then the D/F file will be
* reinstated with a new unique name at the time it is processed. * reinstated with a new unique name at the time it is processed.
*/ */
struct string_list df_sorted_entries; struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
const char *last_file = NULL; const char *last_file = NULL;
int last_len = 0; int last_len = 0;
int i; int i;
@ -449,7 +449,6 @@ static void record_df_conflict_files(struct merge_options *o,
return; return;


/* Ensure D/F conflicts are adjacent in the entries list. */ /* Ensure D/F conflicts are adjacent in the entries list. */
memset(&df_sorted_entries, 0, sizeof(struct string_list));
for (i = 0; i < entries->nr; i++) { for (i = 0; i < entries->nr; i++) {
struct string_list_item *next = &entries->items[i]; struct string_list_item *next = &entries->items[i];
string_list_append(&df_sorted_entries, next->string)->util = string_list_append(&df_sorted_entries, next->string)->util =