Merge branch 'jk/HEAD-symref-in-xfer-namespaces'

diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index b3e7d525d277c339b4f9d821fb6d18dfb2aa2621..d202aaed06fc6cba62a1955e790bbe324d365235 100755 (executable)
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -5,10 +5,10 @@ test_description='Tests rebase performance'
 
 test_perf_default_repo
 
-test_expect_success 'setup' '
-       git checkout -f -b base &&
-       git checkout -b to-rebase &&
-       git checkout -b upstream &&
+test_expect_success 'setup rebasing on top of a lot of changes' '
+       git checkout -f -B base &&
+       git checkout -B to-rebase &&
+       git checkout -B upstream &&
        for i in $(seq 100)
        do
                # simulate huge diffs
@@ -33,4 +33,24 @@ test_perf 'rebase on top of a lot of unrelated changes' '
        git rebase --onto base HEAD^
 '
 
+test_expect_success 'setup rebasing many changes without split-index' '
+       git config core.splitIndex false &&
+       git checkout -B upstream2 to-rebase &&
+       git checkout -B to-rebase2 upstream
+'
+
+test_perf 'rebase a lot of unrelated changes without split-index' '
+       git rebase --onto upstream2 base &&
+       git rebase --onto base upstream2
+'
+
+test_expect_success 'setup rebasing many changes with split-index' '
+       git config core.splitIndex true
+'
+
+test_perf 'rebase a lot of unrelated changes with split-index' '
+       git rebase --onto upstream2 base &&
+       git rebase --onto base upstream2
+'
+
 test_done