Merge branch 'sg/fsck-config-in-doc' into maint

diff --git a/builtin/merge.c b/builtin/merge.c
index 57c2a24f6d82fc7cedcc86979db6ff1a8fa6bc50..29988e54c5be5ecb3afa2382ba73a965e1d2b511 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -457,7 +457,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);
                }
        }