t7700: update to work with MIDX bitmap test knob

A number of these tests are focused only on pack-based bitmaps and need
to be updated to disable 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' where
necessary.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 25b235c06303850e17b90f5fc6c0f84bb962c4c8..98eda3bfeb56c4cd685ed352ee0fe2a885061c31 100755 (executable)
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -63,13 +63,14 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
 
 test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
        # build on $oid, $packid, and .keep state from previous
-       git repack -Adbl &&
+       GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 git repack -Adbl &&
        test_has_duplicate_object true
 '
 
 test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
        # build on $oid, $packid, and .keep state from previous
-       git -c repack.writebitmaps=true repack -Adl &&
+       GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+               git -c repack.writebitmaps=true repack -Adl &&
        test_has_duplicate_object true
 '
 
@@ -189,7 +190,9 @@ test_expect_success 'repack --keep-pack' '
 
 test_expect_success 'bitmaps are created by default in bare repos' '
        git clone --bare .git bare.git &&
-       git -C bare.git repack -ad &&
+       rm -f bare.git/objects/pack/*.bitmap &&
+       GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+               git -C bare.git repack -ad &&
        bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
        test_path_is_file "$bitmap"
 '
@@ -200,7 +203,8 @@ test_expect_success 'incremental repack does not complain' '
 '
 
 test_expect_success 'bitmaps can be disabled on bare repos' '
-       git -c repack.writeBitmaps=false -C bare.git repack -ad &&
+       GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+               git -c repack.writeBitmaps=false -C bare.git repack -ad &&
        bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
        test -z "$bitmap"
 '
@@ -211,7 +215,8 @@ test_expect_success 'no bitmaps created if .keep files present' '
        keep=${pack%.pack}.keep &&
        test_when_finished "rm -f \"\$keep\"" &&
        >"$keep" &&
-       git -C bare.git repack -ad 2>stderr &&
+       GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+               git -C bare.git repack -ad 2>stderr &&
        test_must_be_empty stderr &&
        find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
        test_must_be_empty actual
@@ -222,7 +227,8 @@ test_expect_success 'auto-bitmaps do not complain if unavailable' '
        blob=$(test-tool genrandom big $((1024*1024)) |
               git -C bare.git hash-object -w --stdin) &&
        git -C bare.git update-ref refs/tags/big $blob &&
-       git -C bare.git repack -ad 2>stderr &&
+       GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+               git -C bare.git repack -ad 2>stderr &&
        test_must_be_empty stderr &&
        find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
        test_must_be_empty actual