Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 3d6219d0223e78218f400bd1f0504e62c2058070..2748fa6f2e91d2b788d5b54edfb15de29d8aa833 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -742,7 +742,7 @@ static int finish_rebase(struct rebase_options *opts)
 
        delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
        apply_autostash(opts);
-       close_all_packs(the_repository->objects);
+       close_object_store(the_repository->objects);
        /*
         * We ignore errors in 'gc --auto', since the
         * user should see them.