From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Sat, 25 May 2013 09:08:13 +0000 (+0200)
Subject: find_first_merges(): remove unnecessary code
X-Git-Tag: v1.8.4-rc0~170^2~11
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=5de0c0155c824803a7ee39326b09eeb93e9ec899;p=git.git

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

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