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>

diff --git a/builtin/gc.c b/builtin/gc.c
index 57069442b0dc1297366e29b1fbf0e6ee70377146..8a99ed2af2ba341af037224cd529dbfd031ac222 100644 (file)
--- 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);
 
        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();
                clean_pack_garbage();

+       }

 
        if (gc_write_commit_graph)
                write_commit_graph_reachable(get_object_directory(), 0);
 
        if (gc_write_commit_graph)
                write_commit_graph_reachable(get_object_directory(), 0);

diff --git a/builtin/repack.c b/builtin/repack.c
index 3c30e16ec5483c2a88cbe96f67475746487b31a9..2317608c6b850e3bcf13b153bce583b00af3a28c 100644 (file)
--- 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");
 
        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
        /*
         * Ok we have prepared all new packfiles.
         * First see if there are packs of the same name and if so