From 5de0c0155c824803a7ee39326b09eeb93e9ec899 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 25 May 2013 11:08:13 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- submodule.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/submodule.c b/submodule.c index b837c04ee2..ad476ce5fb 100644 --- a/submodule.c +++ b/submodule.c @@ -893,8 +893,7 @@ static int find_first_merges(struct object_array *result, const char *path, } if (!contains_another) - add_object_array(merges.objects[i].item, - merges.objects[i].name, result); + add_object_array(merges.objects[i].item, NULL, result); } free(merges.objects); -- 2.11.4.GIT