[v4,21/25] t5319: don't write MIDX bitmaps in t5319

Message ID	47eba8ecf93e6e220ffbb98ebdb7e958db2c2d53.1629821743.git.me@ttaylorr.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> Date: Tue, 24 Aug 2021 12:16:44 -0400 From: Taylor Blau <me@ttaylorr.com> To: git@vger.kernel.org Cc: peff@peff.net, dstolee@microsoft.com, gitster@pobox.com, jonathantanmy@google.com Subject: [PATCH v4 21/25] t5319: don't write MIDX bitmaps in t5319 Message-ID: <47eba8ecf93e6e220ffbb98ebdb7e958db2c2d53.1629821743.git.me@ttaylorr.com> References: <cover.1617991824.git.me@ttaylorr.com> <cover.1629821743.git.me@ttaylorr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <cover.1629821743.git.me@ttaylorr.com> Precedence: bulk
Series	multi-pack reachability bitmaps \| expand [v4,00/25] multi-pack reachability bitmaps [v4,01/25] pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps [v4,02/25] pack-bitmap-write.c: gracefully fail to write non-closed bitmaps [v4,03/25] pack-bitmap-write.c: free existing bitmaps [v4,04/25] Documentation: describe MIDX-based bitmaps [v4,05/25] midx: clear auxiliary .rev after replacing the MIDX [v4,06/25] midx: reject empty `--preferred-pack`'s [v4,07/25] midx: infer preferred pack when not given one [v4,08/25] midx: close linked MIDXs, avoid leaking memory [v4,09/25] midx: avoid opening multiple MIDXs when writing [v4,10/25] pack-bitmap.c: introduce 'bitmap_num_objects()' [v4,11/25] pack-bitmap.c: introduce 'nth_bitmap_object_oid()' [v4,12/25] pack-bitmap.c: introduce 'bitmap_is_preferred_refname()' [v4,13/25] pack-bitmap.c: avoid redundant calls to try_partial_reuse [v4,14/25] pack-bitmap: read multi-pack bitmaps [v4,15/25] pack-bitmap: write multi-pack bitmaps [v4,16/25] t5310: move some tests to lib-bitmap.sh [v4,17/25] t/helper/test-read-midx.c: add --checksum mode [v4,18/25] t5326: test multi-pack bitmap behavior [v4,19/25] t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP [v4,20/25] t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP [v4,21/25] t5319: don't write MIDX bitmaps in t5319 [v4,22/25] t7700: update to work with MIDX bitmap test knob [v4,23/25] midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' [v4,24/25] p5310: extract full and partial bitmap tests [v4,25/25] p5326: perf tests for MIDX bitmaps

Message ID

47eba8ecf93e6e220ffbb98ebdb7e958db2c2d53.1629821743.git.me@ttaylorr.com (mailing list archive)

State

Superseded

Headers

Date: Tue, 24 Aug 2021 12:16:44 -0400
From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, dstolee@microsoft.com, gitster@pobox.com,
        jonathantanmy@google.com
Subject: [PATCH v4 21/25] t5319: don't write MIDX bitmaps in t5319
Message-ID: 
 <47eba8ecf93e6e220ffbb98ebdb7e958db2c2d53.1629821743.git.me@ttaylorr.com>
References: <cover.1617991824.git.me@ttaylorr.com>
 <cover.1629821743.git.me@ttaylorr.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <cover.1629821743.git.me@ttaylorr.com>
Precedence: bulk

Series

multi-pack reachability bitmaps | expand

Commit Message

Taylor Blau Aug. 24, 2021, 4:16 p.m. UTC

This test is specifically about generating a midx still respecting a
pack-based bitmap file. Generating a MIDX bitmap would confuse the test.
Let's override the 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' variable to
make sure we don't do so.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
 t/t5319-multi-pack-index.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 9b184bd45e..a81375d920 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -504,7 +504,8 @@  test_expect_success 'repack preserves multi-pack-index when creating packs' '
 compare_results_with_midx "after repack"
 
 test_expect_success 'multi-pack-index and pack-bitmap' '
-	git -c repack.writeBitmaps=true repack -ad &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -c repack.writeBitmaps=true repack -ad &&
 	git multi-pack-index write &&
 	git rev-list --test-bitmap HEAD
 '

[v4,21/25] t5319: don't write MIDX bitmaps in t5319

Commit Message

Patch