]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t6422: fix bad check against missing file
authorElijah Newren <newren@gmail.com>
Mon, 10 Aug 2020 22:29:11 +0000 (22:29 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Aug 2020 22:59:00 +0000 (15:59 -0700)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6422-merge-rename-corner-cases.sh

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