diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-17 01:35:14 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-17 01:35:14 +0100 |
| commit | b9a6830836efd2090eab32c18027b089e8b42db9 (patch) | |
| tree | f2372f627ddd514bd7b2cc1bc50f8120f2d19da5 | |
| parent | Merge branch 'ps/meson-weak-sha1-build' (diff) | |
| parent | t7110: replace `test -f` with `test_path_is_*` helpers (diff) | |
| download | git-b9a6830836efd2090eab32c18027b089e8b42db9.tar.xz git-b9a6830836efd2090eab32c18027b089e8b42db9.zip | |
Merge branch 'mb/t7110-use-test-path-helper'
Test modernization.
* mb/t7110-use-test-path-helper:
t7110: replace `test -f` with `test_path_is_*` helpers
| -rwxr-xr-x | t/t7110-reset-merge.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh index 61669a2d21..9a335071af 100755 --- a/t/t7110-reset-merge.sh +++ b/t/t7110-reset-merge.sh @@ -270,13 +270,13 @@ test_expect_success '--merge is ok with added/deleted merge' ' git reset --hard third && rm -f file2 && test_must_fail git merge branch3 && - ! test -f file2 && - test -f file3 && + test_path_is_missing file2 && + test_path_is_file file3 && git diff --exit-code file3 && git diff --exit-code branch3 file3 && git reset --merge HEAD && - ! test -f file3 && - ! test -f file2 && + test_path_is_missing file3 && + test_path_is_missing file2 && git diff --exit-code --cached ' @@ -284,8 +284,8 @@ test_expect_success '--keep fails with added/deleted merge' ' git reset --hard third && rm -f file2 && test_must_fail git merge branch3 && - ! test -f file2 && - test -f file3 && + test_path_is_missing file2 && + test_path_is_file file3 && git diff --exit-code file3 && git diff --exit-code branch3 file3 && test_must_fail git reset --keep HEAD 2>err.log && |