Skip to content

Commit 2197f87

Browse files
bk2204gitster
authored andcommitted
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 <[email protected]> Reviewed-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c0b65ea commit 2197f87

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t7405-submodule-merge.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ test_expect_success 'git submodule status should display the merge conflict prop
195195
url = $TRASH_DIRECTORY/sub
196196
EOF
197197
cat >expect <<EOF &&
198-
U0000000000000000000000000000000000000000 sub
198+
U$ZERO_OID sub
199199
EOF
200200
git submodule status > actual &&
201201
test_cmp expect actual &&
@@ -214,7 +214,7 @@ test_expect_success 'git submodule status should display the merge conflict prop
214214
url = $TRASH_DIRECTORY/sub
215215
EOF
216216
cat >expect <<EOF &&
217-
U0000000000000000000000000000000000000000 sub
217+
U$ZERO_OID sub
218218
EOF
219219
git submodule status > actual &&
220220
test_cmp expect actual &&

0 commit comments

Comments
 (0)