diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2020-07-29 23:14:04 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-07-30 09:16:47 -0700 |
| commit | 2197f879f2f4821ed734fef8aff13a8fc49720c0 (patch) | |
| tree | 12ca8c014195ad8a3b3511fdd87aa1979678f4e3 | |
| parent | t7400: make hash size independent (diff) | |
| download | tgif-2197f879f2f4821ed734fef8aff13a8fc49720c0.tar.xz | |
t7405: make hash size independent
Use $ZERO_OID instead of hard-coding a fixed size all-zeros object ID.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 4 |
1 files 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 <<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 && |