undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find_first_merges(): remove unnecessary code

Browse Source 
No names are ever set for the object_array_entries in merges, so there
is no need to pretend to copy them to the result array.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2013-05-25 11:08:13 +02:00 committed by Junio C Hamano
parent 3826902d25
commit 5de0c0155c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodule.c
View File

@ -893,8 +893,7 @@ static int find_first_merges(struct object_array *result, const char *path,
} }
if (!contains_another) if (!contains_another)
add_object_array(merges.objects[i].item, add_object_array(merges.objects[i].item, NULL, result);
merges.objects[i].name, result);
} }
free(merges.objects); free(merges.objects);