global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 06:34:21 +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-06-08 13:42:56 +02:00
parent 528560b05c 86b6900a90
commit 103bd8e968
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

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

2
builtin/repack.c
View File

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