From f12d7660e85a3e064c1b6d42af4b9ba80657135e Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 13 Sep 2021 13:50:43 -0400 Subject: [PATCH 1/2] p2000: explicitly turn off sparse index The full index test cases in p2000-sparse-operations.sh relied on the fact that the sparse index was off by default. When this default was flipped, the performance test was not altered. Do so now with the --no-sparse-index flag. Signed-off-by: Derrick Stolee --- t/perf/p2000-sparse-operations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh index c181110a43931f..3847b2b2d010e8 100755 --- a/t/perf/p2000-sparse-operations.sh +++ b/t/perf/p2000-sparse-operations.sh @@ -55,7 +55,7 @@ test_expect_success 'setup repo and indexes' ' git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-v3 && ( cd full-v3 && - git sparse-checkout init --cone && + git sparse-checkout init --cone --no-sparse-index && git sparse-checkout set $SPARSE_CONE && git config index.version 3 && git update-index --index-version=3 && @@ -64,7 +64,7 @@ test_expect_success 'setup repo and indexes' ' git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-v4 && ( cd full-v4 && - git sparse-checkout init --cone && + git sparse-checkout init --cone --no-sparse-index && git sparse-checkout set $SPARSE_CONE && git config index.version 4 && git update-index --index-version=4 && From ba4255302a9528c7722366399d0bf70b42c2b14f Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 13 Sep 2021 13:51:40 -0400 Subject: [PATCH 2/2] p2000: add new commands Signed-off-by: Derrick Stolee --- t/perf/p2000-sparse-operations.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh index 3847b2b2d010e8..fd83a42a87f62c 100755 --- a/t/perf/p2000-sparse-operations.sh +++ b/t/perf/p2000-sparse-operations.sh @@ -123,5 +123,6 @@ test_perf_on_all git blame $SPARSE_CONE/f3/a test_perf_on_all git read-tree -mu HEAD test_perf_on_all git checkout-index -f --all test_perf_on_all git update-index --add --remove $SPARSE_CONE/a +test_perf_on_all git sparse-checkout reapply test_done