gc/repack: release packs when needed
On Windows, files cannot be removed nor renamed if there are still handles held by a process. To remedy that, we introduced the close_all_packs() function. Earlier, we made sure that the packs are released just before `git gc` is spawned, in case that gc wants to remove no-longer needed packs. But this developer forgot that gc itself also needs to let go of packs, e.g. when consolidating all packs via the --aggressive option. Likewise, `git repack -d` wants to delete obsolete packs and therefore needs to close all pack handles, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Dec 15, 2018 at 14:04 UTC
5bdece0d70578edda870b0cf04d598ba04e7a0a3
2 files changed
+5
-1
builtin/gc.c
+3
-1
@@ -642,8 +642,10 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
642
643
report_garbage = report_pack_garbage;
644
reprepare_packed_git(the_repository);
645
- if (pack_garbage.nr > 0)
645
+ if (pack_garbage.nr > 0) {
646
+ close_all_packs(the_repository->objects);
647
clean_pack_garbage();
648
+ }
649
650
if (gc_write_commit_graph)
651
write_commit_graph_reachable(get_object_directory(), 0);
builtin/repack.c
+2
@@ -408,6 +408,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
408
if (!names.nr && !po_args.quiet)
409
printf("Nothing new to pack.\n");
410
411
+ close_all_packs(the_repository->objects);
412
+
413
/*
414
* Ok we have prepared all new packfiles.
415
* First see if there are packs of the same name and if so