apply: rename new_sha1_prefix and old_sha1_prefix

diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 4b6e2825a6dc37db1aadaa4aabf3f1c8fe6cce01..6f56b38674fd62085e757cbc685436107a6bb9fe 100755 (executable)
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -86,8 +86,14 @@ test_expect_success 'write midx with one v1 pack' '
 '
 
 midx_git_two_modes () {
-       git -c core.multiPackIndex=false $1 >expect &&
-       git -c core.multiPackIndex=true $1 >actual &&
+       if [ "$2" = "sorted" ]
+       then
+               git -c core.multiPackIndex=false $1 | sort >expect &&
+               git -c core.multiPackIndex=true $1 | sort >actual
+       else
+               git -c core.multiPackIndex=false $1 >expect &&
+               git -c core.multiPackIndex=true $1 >actual
+       fi &&
        test_cmp expect actual
 }
 
@@ -95,7 +101,10 @@ compare_results_with_midx () {
        MSG=$1
        test_expect_success "check normal git operations: $MSG" '
                midx_git_two_modes "rev-list --objects --all" &&
-               midx_git_two_modes "log --raw"
+               midx_git_two_modes "log --raw" &&
+               midx_git_two_modes "count-objects --verbose" &&
+               midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+               midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
        '
 }
 
@@ -149,6 +158,12 @@ test_expect_success 'repack removes multi-pack-index' '
 
 compare_results_with_midx "after repack"
 
+test_expect_success 'multi-pack-index and pack-bitmap' '
+       git -c repack.writeBitmaps=true repack -ad &&
+       git multi-pack-index write &&
+       git rev-list --test-bitmap HEAD
+'
+
 test_expect_success 'multi-pack-index and alternates' '
        git init --bare alt.git &&
        echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&
@@ -161,7 +176,13 @@ test_expect_success 'multi-pack-index and alternates' '
 compare_results_with_midx "with alternate (local midx)"
 
 test_expect_success 'multi-pack-index in an alternate' '
-       mv .git/objects/pack/* alt.git/objects/pack
+       mv .git/objects/pack/* alt.git/objects/pack &&
+       test_commit add_local_objects &&
+       git repack --local &&
+       git multi-pack-index write &&
+       midx_read_expect 1 3 4 $objdir &&
+       git reset --hard HEAD~1 &&
+       rm -f .git/objects/pack/*
 '
 
 compare_results_with_midx "with alternate (remote midx)"