Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
find_first_merges(): remove unnecessary code
author
Michael Haggerty
<mhagger@alum.mit.edu>
Sat, 25 May 2013 09:08:13 +0000
(11:08 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 28 May 2013 16:25:01 +0000
(09:25 -0700)
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>
submodule.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
3826902
)
diff --git
a/submodule.c
b/submodule.c
index b837c04ee2971c0a26572ea32167472b240345ab..ad476ce5fb894bf62844ee6ca7413ce343f2933a 100644
(file)
--- 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);