find_first_merges(): remove unnecessary code
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>
Michael Haggerty committed
May 25, 2013 at 11:08 UTC
5de0c0155c824803a7ee39326b09eeb93e9ec899
1 file changed
+1
-2
submodule.c
+1
-2
@@ -893,8 +893,7 @@ static int find_first_merges(struct object_array *result, const char *path,
893
}
894
895
if (!contains_another)
896
- add_object_array(merges.objects[i].item,
897
- merges.objects[i].name, result);
896
+ add_object_array(merges.objects[i].item, NULL, result);
897
}
898
899
free(merges.objects);