diff options
| author | Elijah Newren <newren@gmail.com> | 2018-05-24 07:04:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-28 06:09:02 (GMT) |
| commit | 5b0b9712d220e6e2b27d3bab9a5603c5e2573ae8 (patch) | |
| tree | e5622f085d0f14c41fc5f5fac9b7ebf2d0be1343 /t/t6036-recursive-corner-cases.sh | |
| parent | 0cdabc10839809162154e488fae82be51c57e23b (diff) | |
| download | git-5b0b9712d220e6e2b27d3bab9a5603c5e2573ae8.zip git-5b0b9712d220e6e2b27d3bab9a5603c5e2573ae8.tar.gz git-5b0b9712d220e6e2b27d3bab9a5603c5e2573ae8.tar.bz2 | |
t6036, t6042: prefer test_path_is_file, test_path_is_missing
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 3e659cf..b716155 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -488,7 +488,7 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' ' test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) && test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) && - test -f a~HEAD + test_path_is_file a~HEAD ) ' @@ -512,7 +512,7 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' ' test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) && test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) && - test -f a~D^0 + test_path_is_file a~D^0 ) ' |