Merge branch 'jk/p5332-testfix'

gitster · gitster · commit 87b087542532 · 2025-04-29T14:21:32.000-07:00
A test fix.

* jk/p5332-testfix:
  p5332: drop "+" from --stdin-packs input
diff --git a/t/perf/p5332-multi-pack-reuse.sh b/t/perf/p5332-multi-pack-reuse.sh
@@ -58,7 +58,7 @@ do
 	'
 
 	test_expect_success "setup bitmaps for $nr_packs-pack scenario" '
-		find $packdir -type f -name "*.idx" | sed -e "s/.*\/\(.*\)$/+\1/g" |
+		find $packdir -type f -name "*.idx" | sed -e "s/.*\///" |
 		git multi-pack-index write --stdin-packs --bitmap \
 			--preferred-pack="$(find_pack $(git rev-parse HEAD))"
 	'

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ do`
`58`	`58`	`'`
`59`	`59`
`60`	`60`	`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/.\///" \|`
`62`	`62`	`git multi-pack-index write --stdin-packs --bitmap \`
`63`	`63`	`--preferred-pack="$(find_pack $(git rev-parse HEAD))"`
`64`	`64`	`'`