Skip to content

Commit 1aa5063

Browse files
peffgitster
authored andcommitted
p5332: drop "+" from --stdin-packs input
This perf script creates a midx by running "git multi-pack-index write" with the "--stdin-packs" option. We feed that stdin by running "find" on .git/objects/pack, using sed to strip off everything but the basename. But that sed invocation also does something peculiar: it adds a "+" to the start of each pack name. This causes the multi-pack-index command to barf. The modified name does not match any pack it knows about, so it ends up with an empty list of packs to put in the midx. And thus nothing matches the --preferred-pack option we pass, which causes it die(). The fix is to remove the extra "+" (which also lets us simplify the sed invocation a bit, as it is now just stripping the leading directories). But that leaves the mystery of why it was ever there in the first place. The answer is that an earlier iteration of the patch series had a concept of "disjoint" packs in the midx. And one of its patches here: https://lore.kernel.org/git/c52d7e7b27a9add4f58b8334db4fe4498af1c90f.1701198172.git.me@ttaylorr.com/ taught read_packs_from_stdin() to treat a leading "+" as marking a disjoint pack. But in the second version of the series, which was ultimately merged, that disjoint concept went away, and the code to parse "+" did likewise. The regular regression tests were adjusted to match, but this case in t/perf was forgotten. Signed-off-by: Jeff King <[email protected]> Acked-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2f323bb commit 1aa5063

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/perf/p5332-multi-pack-reuse.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ do
5858
'
5959

6060
test_expect_success "setup bitmaps for $nr_packs-pack scenario" '
61-
find $packdir -type f -name "*.idx" | sed -e "s/.*\/\(.*\)$/+\1/g" |
61+
find $packdir -type f -name "*.idx" | sed -e "s/.*\///" |
6262
git multi-pack-index write --stdin-packs --bitmap \
6363
--preferred-pack="$(find_pack $(git rev-parse HEAD))"
6464
'

0 commit comments

Comments
 (0)