Merge branch 'jk/p5302-avoid-collision-check-cost'

Fix index-pack perf test so that the repeated invocations always
run in an empty repository, which emulates the initial clone
situation better.

* jk/p5302-avoid-collision-check-cost:
p5302: create the repo in each index-pack test

diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index 99bdb16c8583a98b0c33cddadabb85f47b7d5c41..a9b3e112d98223134d791727ffcde01e9123b117 100755 (executable)
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -13,35 +13,40 @@ test_expect_success 'repack' '
        export PACK
 '
 
-test_expect_success 'create target repositories' '
-       for repo in t1 t2 t3 t4 t5 t6
-       do
-               git init --bare $repo
-       done
-'
-
 test_perf 'index-pack 0 threads' '
-       GIT_DIR=t1 git index-pack --threads=1 --stdin < $PACK
+       rm -rf repo.git &&
+       git init --bare repo.git &&
+       GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK
 '
 
 test_perf 'index-pack 1 thread ' '
-       GIT_DIR=t2 GIT_FORCE_THREADS=1 git index-pack --threads=1 --stdin < $PACK
+       rm -rf repo.git &&
+       git init --bare repo.git &&
+       GIT_DIR=repo.git GIT_FORCE_THREADS=1 git index-pack --threads=1 --stdin < $PACK
 '
 
 test_perf 'index-pack 2 threads' '
-       GIT_DIR=t3 git index-pack --threads=2 --stdin < $PACK
+       rm -rf repo.git &&
+       git init --bare repo.git &&
+       GIT_DIR=repo.git git index-pack --threads=2 --stdin < $PACK
 '
 
 test_perf 'index-pack 4 threads' '
-       GIT_DIR=t4 git index-pack --threads=4 --stdin < $PACK
+       rm -rf repo.git &&
+       git init --bare repo.git &&
+       GIT_DIR=repo.git git index-pack --threads=4 --stdin < $PACK
 '
 
 test_perf 'index-pack 8 threads' '
-       GIT_DIR=t5 git index-pack --threads=8 --stdin < $PACK
+       rm -rf repo.git &&
+       git init --bare repo.git &&
+       GIT_DIR=repo.git git index-pack --threads=8 --stdin < $PACK
 '
 
 test_perf 'index-pack default number of threads' '
-       GIT_DIR=t6 git index-pack --stdin < $PACK
+       rm -rf repo.git &&
+       git init --bare repo.git &&
+       GIT_DIR=repo.git git index-pack --stdin < $PACK
 '
 
 test_done