@matheusbsbs / matheus-bagliano / commits / f25e33c156

builtin/repack.c: do not repack single packs with --geometric

In 0fabafd0b9 (builtin/repack.c: add '--geometric' option, 2021-02-22), the 'git repack --geometric' code aborts early when there is zero or one pack. When there are no packs, this code does the right thing by placing the split at "0". But when there is exactly one pack, the split is placed at "1", which means that "git repack --geometric" (with any factor) repacks all of the objects in a single pack. This is wasteful, and the remaining code in split_pack_geometry() does the right thing (not repacking the objects in a single pack) even when only one pack is present. Loosen the guard to only stop when there aren't any packs, and let the rest of the code do the right thing. Add a test to ensure that this is the case. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Mar 5, 2021 at 10:21 UTC f25e33c1566fecb097a460f0649ac1a20c418843
2 files changed +16 -1
builtin/repack.c
+1 -1
@@ -351,7 +351,7 @@ static void split_pack_geometry(struct pack_geometry *geometry, int factor)
351 uint32_t split;
352 off_t total_size = 0;
353
354 - if (geometry->pack_nr <= 1) {
354 + if (!geometry->pack_nr) {
355 geometry->split = geometry->pack_nr;
356 return;
357 }
t/t7703-repack-geometric.sh
+15
@@ -20,6 +20,21 @@ test_expect_success '--geometric with no packs' '
20 )
21 '
22
23 +test_expect_success '--geometric with one pack' '
24 + git init geometric &&
25 + test_when_finished "rm -fr geometric" &&
26 + (
27 + cd geometric &&
28 +
29 + test_commit "base" &&
30 + git repack -d &&
31 +
32 + git repack --geometric 2 >out &&
33 +
34 + test_i18ngrep "Nothing new to pack" out
35 + )
36 +'
37 +
38 test_expect_success '--geometric with an intact progression' '
39 git init geometric &&
40 test_when_finished "rm -fr geometric" &&