global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-24 09:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'release-gc-repack' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2017-09-26 11:01:25 +02:00
parent 2aef1d54b8 e537979e35
commit d26fbe8cf8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/gc.c
View File

@@ -473,8 +473,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; "

2
builtin/repack.c
View File

@@ -304,6 +304,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