summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2021-08-31 16:52:36 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-01 13:56:43 -0700
commiteb6e956e79cb800a481bf8b52a31b160a8971fb8 (patch)
treeffd5da13610c960f29c54bb87cdb9356972dc3e8
parentt0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP (diff)
downloadtgif-eb6e956e79cb800a481bf8b52a31b160a8971fb8.tar.xz
t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
Generating a MIDX bitmap confuses many of the tests in t5310, which expect to control whether and how bitmaps are written. Since the relevant MIDX-bitmap tests here are covered already in t5326, let's just disable the flag for the whole t5310 script. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5310-pack-bitmaps.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 4318f84d53..673baa5c3c 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -8,6 +8,10 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. "$TEST_DIRECTORY"/lib-bundle.sh
. "$TEST_DIRECTORY"/lib-bitmap.sh
+# t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in
+# their place.
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
objpath () {
echo ".git/objects/$(echo "$1" | sed -e 's|\(..\)|\1/|')"
}