From bae133efcef11ea2edf0a2d1e03a63dfeab4b5ce Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 8 Jun 2016 08:32:21 +0200 Subject: [PATCH] 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 --- builtin/gc.c | 4 +++- builtin/repack.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/builtin/gc.c b/builtin/gc.c index f51e5a6500..e2a7bdf7a6 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -480,8 +480,10 @@ int cmd_gc(int argc, const char **argv, const char *prefix) report_garbage = report_pack_garbage; reprepare_packed_git(); - if (pack_garbage.nr > 0) + if (pack_garbage.nr > 0) { + close_all_packs(); clean_pack_garbage(); + } if (auto_gc && too_many_loose_objects()) warning(_("There are too many unreachable loose objects; " diff --git a/builtin/repack.c b/builtin/repack.c index 7bdb40142f..9d5412d34e 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -8,6 +8,7 @@ #include "strbuf.h" #include "string-list.h" #include "argv-array.h" +#include "packfile.h" static int delta_base_offset = 1; static int pack_kept_objects = -1; @@ -308,6 +309,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (!names.nr && !quiet) printf("Nothing new to pack.\n"); + close_all_packs(); + /* * Ok we have prepared all new packfiles. * First see if there are packs of the same name and if so