[v2,04/24] t5310: drop size of truncated ewah bitmap

Message ID	f779e76f82bd2684e835affa45583063772d1c1b.1605649533.git.me@ttaylorr.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> Date: Tue, 17 Nov 2020 16:46:44 -0500 From: Taylor Blau <me@ttaylorr.com> To: git@vger.kernel.org Cc: dstolee@microsoft.com, gitster@pobox.com, peff@peff.net, martin.agren@gmail.com, szeder.dev@gmail.com Subject: [PATCH v2 04/24] t5310: drop size of truncated ewah bitmap Message-ID: <f779e76f82bd2684e835affa45583063772d1c1b.1605649533.git.me@ttaylorr.com> References: <cover.1605123652.git.me@ttaylorr.com> <cover.1605649533.git.me@ttaylorr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <cover.1605649533.git.me@ttaylorr.com> Precedence: bulk
Series	pack-bitmap: bitmap generation improvements \| expand [v2,00/24] pack-bitmap: bitmap generation improvements [v2,01/24] ewah/ewah_bitmap.c: grow buffer past 1 [v2,02/24] pack-bitmap: fix header size check [v2,03/24] pack-bitmap: bounds-check size of cache extension [v2,04/24] t5310: drop size of truncated ewah bitmap [v2,05/24] rev-list: die when --test-bitmap detects a mismatch [v2,06/24] ewah: factor out bitmap growth [v2,07/24] ewah: make bitmap growth less aggressive [v2,08/24] ewah: implement bitmap_or() [v2,09/24] ewah: add bitmap_dup() function [v2,10/24] pack-bitmap-write: reimplement bitmap writing [v2,11/24] pack-bitmap-write: pass ownership of intermediate bitmaps [v2,12/24] pack-bitmap-write: fill bitmap with commit history [v2,13/24] bitmap: add bitmap_diff_nonzero() [v2,14/24] commit: implement commit_list_contains() [v2,15/24] t5310: add branch-based checks [v2,16/24] pack-bitmap-write: rename children to reverse_edges [v2,17/24] pack-bitmap.c: check reads more aggressively when loading [v2,18/24] pack-bitmap-write: build fewer intermediate bitmaps [v2,19/24] pack-bitmap-write: ignore BITMAP_FLAG_REUSE [v2,20/24] pack-bitmap: factor out 'bitmap_for_commit()' [v2,21/24] pack-bitmap: factor out 'add_commit_to_bitmap()' [v2,22/24] pack-bitmap-write: use existing bitmaps [v2,23/24] pack-bitmap-write: relax unique rewalk condition [v2,24/24] pack-bitmap-write: better reuse bitmaps

Message ID

f779e76f82bd2684e835affa45583063772d1c1b.1605649533.git.me@ttaylorr.com (mailing list archive)

State

Superseded

Headers

Date: Tue, 17 Nov 2020 16:46:44 -0500
From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: dstolee@microsoft.com, gitster@pobox.com, peff@peff.net,
        martin.agren@gmail.com, szeder.dev@gmail.com
Subject: [PATCH v2 04/24] t5310: drop size of truncated ewah bitmap
Message-ID: 
 <f779e76f82bd2684e835affa45583063772d1c1b.1605649533.git.me@ttaylorr.com>
References: <cover.1605123652.git.me@ttaylorr.com>
 <cover.1605649533.git.me@ttaylorr.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <cover.1605649533.git.me@ttaylorr.com>
Precedence: bulk

Series

pack-bitmap: bitmap generation improvements | expand

Commit Message

Taylor Blau Nov. 17, 2020, 9:46 p.m. UTC

From: Jeff King <peff@peff.net>

We truncate the .bitmap file to 512 bytes and expect to run into
problems reading an individual ewah file. But this length is somewhat
arbitrary, and just happened to work when the test was added in
9d2e330b17 (ewah_read_mmap: bounds-check mmap reads, 2018-06-14).

An upcoming commit will change the size of the history we create in the
test repo, which will cause this test to fail. We can future-proof it a
bit more by reducing the size of the truncated bitmap file.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
 t/t5310-pack-bitmaps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index e2c3907a68..70a4fc4843 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -349,7 +349,7 @@  test_expect_success 'truncated bitmap fails gracefully (ewah)' '
 	git rev-list --use-bitmap-index --count --all >expect &&
 	bitmap=$(ls .git/objects/pack/*.bitmap) &&
 	test_when_finished "rm -f $bitmap" &&
-	test_copy_bytes 512 <$bitmap >$bitmap.tmp &&
+	test_copy_bytes 256 <$bitmap >$bitmap.tmp &&
 	mv -f $bitmap.tmp $bitmap &&
 	git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
 	test_cmp expect actual &&

[v2,04/24] t5310: drop size of truncated ewah bitmap

Commit Message

Patch