t6422: fix bad check against missing file
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 10, 2020 at 22:29 UTC
3b6eb15d2b419c26bf1490b932c45913a1acb601
1 file changed
+3
-3
t/t6422-merge-rename-corner-cases.sh
+3
-3
@@ -906,7 +906,7 @@ test_expect_failure 'rad-check: rename/add/delete conflict' '
906
git rev-parse >expect \
907
B:bar A:bar &&
908
909
- test_cmp file_is_missing foo &&
909
+ test_path_is_missing foo &&
910
# bar should have two-way merged contents of the different
911
# versions of bar; check that content from both sides is
912
# present.
@@ -974,8 +974,8 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
974
git rev-parse >expect \
975
O:foo O:bar &&
976
977
- test_cmp file_is_missing foo &&
978
- test_cmp file_is_missing bar &&
977
+ test_path_is_missing foo &&
978
+ test_path_is_missing bar &&
979
# baz should have two-way merged contents of the original
980
# contents of foo and bar; check that content from both sides
981
# is present.