Merge 'release-gc-repack' into HEAD

git-for-windows · May 24, 2018 · ecde480 · ecde480
2 parents 34d7757 + 2d68698
commit ecde480
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/builtin/gc.c b/builtin/gc.c
@@ -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; "

diff --git a/builtin/repack.c b/builtin/repack.c
@@ -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