Merge branch 'bc/rev-parse-parseopt-fix'

diff --git a/submodule.c b/submodule.c
index b12600fc798f4427c8ad3bff1384c6fb5a6f4bc5..f2f30bb488c05d9002d755feed65e9ca781a440c 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1685,7 +1685,7 @@ static int find_first_merges(struct object_array *result, const char *path,
                        add_object_array(merges.objects[i].item, NULL, result);
        }
 
-       free(merges.objects);
+       object_array_clear(&merges);
        return result->nr;
 }
 
@@ -1790,7 +1790,7 @@ int merge_submodule(struct object_id *result, const char *path,
                        print_commit((struct commit *) merges.objects[i].item);
        }
 
-       free(merges.objects);
+       object_array_clear(&merges);
        return 0;
 }