diff mbox series

[v3,10/39] t7003: compute appropriate length constant

Message ID	20200723010943.2329634-11-sandals@crustytoothpaste.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=AzkS=BC=vger.kernel.org=git-owner@kernel.org> From: "brian m. carlson" <sandals@crustytoothpaste.net> To: <git@vger.kernel.org> Subject: [PATCH v3 10/39] t7003: compute appropriate length constant Date: Thu, 23 Jul 2020 01:09:14 +0000 Message-Id: <20200723010943.2329634-11-sandals@crustytoothpaste.net> In-Reply-To: <20200723010943.2329634-1-sandals@crustytoothpaste.net> References: <20200723010943.2329634-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	SHA-256, part 3/3 \| expand [v3,00/39] SHA-256, part 3/3 [v3,01/39] t: make test-bloom initialize repository [v3,02/39] t1001: use $ZERO_OID [v3,03/39] t3305: make hash agnostic [v3,04/39] t3404: prepare 'short SHA-1 collision' tests for SHA-256 [v3,05/39] t6100: make hash size independent [v3,06/39] t6101: make hash size independent [v3,07/39] t6301: make hash size independent [v3,08/39] t6500: specify test values for SHA-256 [v3,09/39] t6501: avoid hard-coded objects [v3,10/39] t7003: compute appropriate length constant [v3,11/39] t7063: make hash size independent [v3,12/39] t7201: abstract away SHA-1-specific constants [v3,13/39] t7102: abstract away SHA-1-specific constants [v3,14/39] t7400: make hash size independent [v3,15/39] t7405: make hash size independent [v3,16/39] t7506: avoid checking for SHA-1-specific constants [v3,17/39] t7508: use $ZERO_OID instead of hard-coded constant [v3,18/39] t8002: make hash size independent [v3,19/39] t8003: make hash size independent [v3,20/39] t8011: make hash size independent [v3,21/39] t9300: abstract away SHA-1-specific constants [v3,22/39] t9300: use $ZERO_OID instead of hard-coded object ID [v3,23/39] t9301: make hash size independent [v3,24/39] t9350: make hash size independent [v3,25/39] t9500: ensure that algorithm info is preserved in config [v3,26/39] t9700: make hash size independent [v3,27/39] t5308: make test work with SHA-256 [v3,28/39] t0410: mark test with SHA1 prerequisite [v3,29/39] http-fetch: set up git directory before parsing pack hashes [v3,30/39] builtin/verify-pack: implement an --object-format option [v3,31/39] bundle: add new version for use with SHA-256 [v3,32/39] setup: add support for reading extensions.objectformat [v3,33/39] Enable SHA-256 support by default [v3,34/39] t: add test_oid option to select hash algorithm [v3,35/39] t: allow testing different hash algorithms via environment [v3,36/39] t: make SHA1 prerequisite depend on default hash [v3,37/39] ci: run tests with SHA-256 [v3,38/39] docs: add documentation for extensions.objectFormat [v3,39/39] t: remove test_oid_init in tests

Commit Message

brian m. carlson July 23, 2020, 1:09 a.m. UTC

Instead of using a specific invalid hard-coded object ID, look one
up from the translation table.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t7003-filter-branch.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e23de7d0b5..beeb2b855a 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -5,6 +5,7 @@  test_description='git filter-branch'
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
 test_expect_success 'setup' '
+	test_oid_init &&
 	test_commit A &&
 	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
 	test_commit --notick B &&
@@ -463,10 +464,11 @@  test_expect_success 'rewrite submodule with another content' '
 '
 
 test_expect_success 'replace submodule revision' '
+	invalid=$(test_oid numeric) &&
 	git reset --hard original &&
 	git filter-branch -f --tree-filter \
 	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
-	     then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
+	     then git update-index --cacheinfo 160000 $invalid submod
 	     fi" HEAD &&
 	test $orig_head != $(git show-ref --hash --head HEAD)
 '