[PATCH 15/17] find_first_merges(): remove unnecessary code
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- May 19, 2013, 20:27 UTC
- Message-ID
- <1368995232-11042-16-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1368995232-11042-1-git-send-email-mhagger@alum.mit.edu>
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> --- submodule.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c index b837c04..ad476ce 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);
-- 1.8.2.3