mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6422: fix bad check against missing file

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2020-08-10 22:29:11 +00:00
committed by Junio C Hamano
parent bc29dffe59
commit 3b6eb15d2b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t6422-merge-rename-corner-cases.sh
View File

@ -906,7 +906,7 @@ test_expect_failure 'rad-check: rename/add/delete conflict' '
git rev-parse >expect \ git rev-parse >expect \
B:bar A:bar && B:bar A:bar &&
test_cmp file_is_missing foo && test_path_is_missing foo &&
# bar should have two-way merged contents of the different # bar should have two-way merged contents of the different
# versions of bar; check that content from both sides is # versions of bar; check that content from both sides is
# present. # present.
@ -974,8 +974,8 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
git rev-parse >expect \ git rev-parse >expect \
O:foo O:bar && O:foo O:bar &&
test_cmp file_is_missing foo && test_path_is_missing foo &&
test_cmp file_is_missing bar && test_path_is_missing bar &&
# baz should have two-way merged contents of the original # baz should have two-way merged contents of the original
# contents of foo and bar; check that content from both sides # contents of foo and bar; check that content from both sides
# is present. # is present.