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>
brian m. carlson committed
Jul 29, 2020 at 23:14 UTC
2197f879f2f4821ed734fef8aff13a8fc49720c0
1 file changed
+2
-2
t/t7405-submodule-merge.sh
+2
-2
@@ -195,7 +195,7 @@ test_expect_success 'git submodule status should display the merge conflict prop
195
url = $TRASH_DIRECTORY/sub
196
EOF
197
cat >expect <<EOF &&
198
-U0000000000000000000000000000000000000000 sub
198
+U$ZERO_OID sub
199
EOF
200
git submodule status > actual &&
201
test_cmp expect actual &&
@@ -214,7 +214,7 @@ test_expect_success 'git submodule status should display the merge conflict prop
214
url = $TRASH_DIRECTORY/sub
215
EOF
216
cat >expect <<EOF &&
217
-U0000000000000000000000000000000000000000 sub
217
+U$ZERO_OID sub
218
EOF
219
git submodule status > actual &&
220
test_cmp expect actual &&