diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2013-05-25 09:08:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 16:25:01 (GMT) |
| commit | 5de0c0155c824803a7ee39326b09eeb93e9ec899 (patch) | |
| tree | 3e8afe653ee12a443cb831a6b9eda8714c2a14f6 /submodule.c | |
| parent | 3826902d25febf61274925d6f12cc7471ba3c38f (diff) | |
| download | git-5de0c0155c824803a7ee39326b09eeb93e9ec899.zip git-5de0c0155c824803a7ee39326b09eeb93e9ec899.tar.gz git-5de0c0155c824803a7ee39326b09eeb93e9ec899.tar.bz2 | |
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>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 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); |