Merge branch 'pw/rebase-abort-clean-rewritten'

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 77b7122456dbc893809038217bdd6f0972fc6745..610eadf5f092a651fe3d04b07528f40f6adddafe 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -2042,7 +2042,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
                        proc.git_cmd = 1;
                        proc.argv = argv_gc_auto;
 
-                       close_all_packs(the_repository->objects);
+                       close_object_store(the_repository->objects);
                        if (!start_command(&proc)) {
                                if (use_sideband)
                                        copy_to_sideband(proc.err, -1, NULL);