Merge branch 'ds/close-object-store'

diff --git a/builtin/merge.c b/builtin/merge.c
index 6e99aead46390a60580966160c556b39ec890126..aad5a9504c8546db0adfd36c59cb1ad1918a56e9 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -453,7 +453,7 @@ static void finish(struct commit *head_commit,
                         * We ignore errors in 'gc --auto', since the
                         * user should see them.
                         */
-                       close_all_packs(the_repository->objects);
+                       close_object_store(the_repository->objects);
                        run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
                }
        }