diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-15 22:04:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-11 17:22:39 (GMT) |
| commit | 5bdece0d70578edda870b0cf04d598ba04e7a0a3 (patch) | |
| tree | f9adb0a00ac6e23e7ca27dd963054b9b23189723 | |
| parent | 98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad (diff) | |
| download | git-5bdece0d70578edda870b0cf04d598ba04e7a0a3.zip git-5bdece0d70578edda870b0cf04d598ba04e7a0a3.tar.gz git-5bdece0d70578edda870b0cf04d598ba04e7a0a3.tar.bz2 | |
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>
| -rw-r--r-- | builtin/gc.c | 4 | ||||
| -rw-r--r-- | builtin/repack.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 5706944..8a99ed2 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -642,8 +642,10 @@ int cmd_gc(int argc, const char **argv, const char *prefix) report_garbage = report_pack_garbage; reprepare_packed_git(the_repository); - if (pack_garbage.nr > 0) + if (pack_garbage.nr > 0) { + close_all_packs(the_repository->objects); clean_pack_garbage(); + } if (gc_write_commit_graph) write_commit_graph_reachable(get_object_directory(), 0); diff --git a/builtin/repack.c b/builtin/repack.c index 3c30e16..2317608 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -408,6 +408,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (!names.nr && !po_args.quiet) printf("Nothing new to pack.\n"); + close_all_packs(the_repository->objects); + /* * Ok we have prepared all new packfiles. * First see if there are packs of the same name and if so |