diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:11 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-10 15:59:00 -0700 |
| commit | 3b6eb15d2b419c26bf1490b932c45913a1acb601 (patch) | |
| tree | 8a5e59b049da2642cd0d4852403e768831de54e1 | |
| parent | t6418: tighten delete/normalize conflict testcase (diff) | |
| download | tgif-3b6eb15d2b419c26bf1490b932c45913a1acb601.tar.xz | |
t6422: fix bad check against missing file
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t6422-merge-rename-corner-cases.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh index f163893ff9..7da75c1736 100755 --- a/t/t6422-merge-rename-corner-cases.sh +++ b/t/t6422-merge-rename-corner-cases.sh @@ -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. |