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

Merge 'release-gc-repack' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2018-05-24 15:06:39 +02:00
parent 34d7757a0e 2d686987b4
commit ecde480ee6
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

@@ -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; "

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;
@@ -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