Merge branch 'sb/diff-color-move'

diff --git a/submodule.c b/submodule.c
index 50bf3fb09c7ca7a890112304e96043623da5f6f5..3e3ea11761fda1c48a3cdd88e146a0f20338c364 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;
 }