diff mbox series

[v6,15/39] t7405: make hash size independent

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

Commit Message

brian m. carlson July 29, 2020, 11:14 p.m. UTC

Use $ZERO_OID instead of hard-coding a fixed size all-zeros object ID.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t7405-submodule-merge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index aa33978ed2..6a1e5f8232 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -195,7 +195,7 @@  test_expect_success 'git submodule status should display the merge conflict prop
        url = $TRASH_DIRECTORY/sub
 EOF
        cat >expect <<EOF &&
-U0000000000000000000000000000000000000000 sub
+U$ZERO_OID sub
 EOF
        git submodule status > actual &&
        test_cmp expect actual &&
@@ -214,7 +214,7 @@  test_expect_success 'git submodule status should display the merge conflict prop
        url = $TRASH_DIRECTORY/sub
 EOF
        cat >expect <<EOF &&
-U0000000000000000000000000000000000000000 sub
+U$ZERO_OID sub
 EOF
        git submodule status > actual &&
        test_cmp expect actual &&