find_first_merges(): remove unnecessary code

mhagger · gitster · commit 5de0c0155c82 · 2013-05-28T09:25:01.000-07:00
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 &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -893,8 +893,7 @@ static int find_first_merges(struct object_array result, const char path,`
`893`	`893`	`}`
`894`	`894`
`895`	`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);`
`898`	`897`	`}`
`899`	`898`
`900`	`899`	`free(merges.objects);`