global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-21 16:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gc/repack: release packs when needed

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2016-06-08 08:32:21 +02:00
parent f74bb70770
commit 44f58d64ef
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/gc.c
View File

@@ -638,8 +638,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 (auto_gc && too_many_loose_objects())
warning(_("There are too many unreachable loose objects; "

3
builtin/repack.c
View File

@@ -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;
@@ -323,6 +324,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(the_repository->objects);
/*
* Ok we have prepared all new packfiles.
* First see if there are packs of the same name and if so