Merge branch 'rs/repack-without-loosening-promised-objects'

gitster · gitster · commit a0f521b56c72 · 2021-05-10T16:59:47.000+09:00
"git repack -A -d" in a partial clone unnecessarily loosened
objects in promisor pack.

* rs/repack-without-loosening-promised-objects:
  repack: avoid loosening promisor objects in partial clones
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -3479,6 +3479,7 @@ static void loosen_unused_packed_objects(void)
 {
 	struct packed_git *p;
 	uint32_t i;
+	uint32_t loosened_objects_nr = 0;
 	struct object_id oid;
 
 	for (p = get_all_packs(the_repository); p; p = p->next) {
@@ -3492,11 +3493,16 @@ static void loosen_unused_packed_objects(void)
 			nth_packed_object_id(&oid, p, i);
 			if (!packlist_find(&to_pack, &oid) &&
 			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
-			    !loosened_object_can_be_discarded(&oid, p->mtime))
+			    !loosened_object_can_be_discarded(&oid, p->mtime)) {
 				if (force_object_loose(&oid, p->mtime))
 					die(_("unable to force loose object"));
+				loosened_objects_nr++;
+			}
 		}
 	}
+
+	trace2_data_intmax("pack-objects", the_repository,
+			   "loosen_unused_packed_objects/loosened", loosened_objects_nr);
 }
 
 /*
diff --git a/builtin/repack.c b/builtin/repack.c
@@ -20,7 +20,7 @@ static int delta_base_offset = 1;
 static int pack_kept_objects = -1;
 static int write_bitmaps = -1;
 static int use_delta_islands;
-static char *packdir, *packtmp;
+static char *packdir, *packtmp_name, *packtmp;
 
 static const char *const git_repack_usage[] = {
 	N_("git repack [<options>]"),
@@ -530,7 +530,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	}
 
 	packdir = mkpathdup("%s/pack", get_object_directory());
-	packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid());
+	packtmp_name = xstrfmt(".tmp-%d-pack", (int)getpid());
+	packtmp = mkpathdup("%s/%s", packdir, packtmp_name);
 
 	sigchain_push_common(remove_pack_on_signal);
 
@@ -573,6 +574,10 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		repack_promisor_objects(&po_args, &names);
 
 		if (existing_packs.nr && delete_redundant) {
+			for_each_string_list_item(item, &names) {
+				strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
+					     packtmp_name, item->string);
+			}
 			if (unpack_unreachable) {
 				strvec_pushf(&cmd.args,
 					     "--unpack-unreachable=%s",
diff --git a/t/perf/p5600-partial-clone.sh b/t/perf/p5600-partial-clone.sh
@@ -35,4 +35,8 @@ test_perf 'count non-promisor commits' '
 	git -C bare.git rev-list --all --count --exclude-promisor-objects
 '
 
+test_perf 'gc' '
+	git -C bare.git gc
+'
+
 test_done
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
@@ -548,6 +548,14 @@ test_expect_success 'fetch from a partial clone, protocol v2' '
 	grep "version 2" trace
 '
 
+test_expect_success 'repack does not loosen promisor objects' '
+	rm -rf client trace &&
+	git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
+	test_when_finished "rm -rf client trace" &&
+	GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
+	grep "loosen_unused_packed_objects/loosened:0" trace
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 

Original file line number	Diff line number	Diff line change
`@@ -3479,6 +3479,7 @@ static void loosen_unused_packed_objects(void)`
`3479`	`3479`	`{`
`3480`	`3480`	`struct packed_git *p;`
`3481`	`3481`	`uint32_t i;`
	`3482`	`+ uint32_t loosened_objects_nr = 0;`
`3482`	`3483`	`struct object_id oid;`
`3483`	`3484`
`3484`	`3485`	`for (p = get_all_packs(the_repository); p; p = p->next) {`
`@@ -3492,11 +3493,16 @@ static void loosen_unused_packed_objects(void)`
`3492`	`3493`	`nth_packed_object_id(&oid, p, i);`
`3493`	`3494`	`if (!packlist_find(&to_pack, &oid) &&`
`3494`	`3495`	`!has_sha1_pack_kept_or_nonlocal(&oid) &&`
`3495`		`- !loosened_object_can_be_discarded(&oid, p->mtime))`
	`3496`	`+ !loosened_object_can_be_discarded(&oid, p->mtime)) {`
`3496`	`3497`	`if (force_object_loose(&oid, p->mtime))`
`3497`	`3498`	`die(_("unable to force loose object"));`
	`3499`	`+ loosened_objects_nr++;`
	`3500`	`+ }`
`3498`	`3501`	`}`
`3499`	`3502`	`}`
	`3503`	`+`
	`3504`	`+ trace2_data_intmax("pack-objects", the_repository,`
	`3505`	`+ "loosen_unused_packed_objects/loosened", loosened_objects_nr);`
`3500`	`3506`	`}`
`3501`	`3507`
`3502`	`3508`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,8 @@ test_perf 'count non-promisor commits' '`
`35`	`35`	`git -C bare.git rev-list --all --count --exclude-promisor-objects`
`36`	`36`	`'`
`37`	`37`
	`38`	`+test_perf 'gc' '`
	`39`	`+ git -C bare.git gc`
	`40`	`+'`
	`41`	`+`
`38`	`42`	`test_done`