From: brian m. carlson Date: Wed, 29 Jul 2020 23:14:04 GMT Subject: [PATCH v6 15/39] t7405: make hash size independent Message-ID: <20200729231428.3658647-16-sandals@crustytoothpaste.net> In-Reply-To: <20200729231428.3658647-1-sandals@crustytoothpaste.net> Use $ZERO_OID instead of hard-coding a fixed size all-zeros object ID. Signed-off-by: brian m. carlson --- t/t7405-submodule-merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 < 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 < actual && test_cmp expect actual &&