Merge branch 'jk/sort-iter-test-output'

diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 1be3459c5b8aa331a646e3ead24f7422110cdc08..6640329ebf609c5054a6f97919005855790571a6 100755 (executable)
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -21,21 +21,14 @@ has_any () {
 }
 
 test_expect_success 'setup repo with moderate-sized history' '
-       for i in $(test_seq 1 10)
-       do
-               test_commit $i
-       done &&
+       test_commit_bulk --id=file 100 &&
        git checkout -b other HEAD~5 &&
-       for i in $(test_seq 1 10)
-       do
-               test_commit side-$i
-       done &&
+       test_commit_bulk --id=side 10 &&
        git checkout master &&
        bitmaptip=$(git rev-parse master) &&
        blob=$(echo tagged-blob | git hash-object -w --stdin) &&
        git tag tagged-blob $blob &&
-       git config repack.writebitmaps true &&
-       git config pack.writebitmaphashcache true
+       git config repack.writebitmaps true
 '
 
 test_expect_success 'full repack creates bitmaps' '
@@ -107,10 +100,7 @@ test_expect_success 'clone from bitmapped repository' '
 '
 
 test_expect_success 'setup further non-bitmapped commits' '
-       for i in $(test_seq 1 10)
-       do
-               test_commit further-$i
-       done
+       test_commit_bulk --id=further 10
 '
 
 rev_list_tests 'partial bitmap'
@@ -191,6 +181,7 @@ test_expect_success 'pack-objects respects --honor-pack-keep (local bitmapped pa
 
 test_expect_success 'pack-objects respects --local (non-local bitmapped pack)' '
        mv .git/objects/pack/$packbitmap.* alt.git/objects/pack/ &&
+       rm -f .git/objects/pack/multi-pack-index &&
        test_when_finished "mv alt.git/objects/pack/$packbitmap.* .git/objects/pack/" &&
        echo HEAD | git pack-objects --local --stdout --revs >3b.pack &&
        git index-pack 3b.pack &&
@@ -268,7 +259,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '
        git clone --bare . compat-jgit.git &&
        (
                cd compat-jgit.git &&
-               rm -f .git/objects/pack/*.bitmap &&
+               rm -f objects/pack/*.bitmap &&
                jgit gc &&
                git rev-list --test-bitmap HEAD
        )