diff options
| author | Shourya Shukla <shouryashukla.oo@gmail.com> | 2020-01-18 09:33:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-21 22:57:42 +0100 |
| commit | c513a958b69090c02ad422b0cd4622009bb4b9f5 (patch) | |
| tree | cf819a6b8459f4e752b0adf08d20350ade92b6ed /t/t6025-merge-symlinks.sh | |
| parent | t6025: modernize style (diff) | |
| download | git-c513a958b69090c02ad422b0cd4622009bb4b9f5.tar.xz git-c513a958b69090c02ad422b0cd4622009bb4b9f5.zip | |
t6025: use helpers to replace test -f <path>
Take advantage of helper function 'test_path_is_file()' to
replace 'test -f' since the function makes the code more
readable and gives better error messages.
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6025-merge-symlinks.sh')
| -rwxr-xr-x | t/t6025-merge-symlinks.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh index d257dcf34d..6c0a90d044 100755 --- a/t/t6025-merge-symlinks.sh +++ b/t/t6025-merge-symlinks.sh @@ -36,7 +36,7 @@ test_expect_success 'merge master into b-symlink, which has a different symbolic ' test_expect_success 'the merge result must be a file' ' - test -f symlink + test_path_is_file symlink ' test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' ' @@ -46,7 +46,7 @@ test_expect_success 'merge master into b-file, which has a file instead of a sym ' test_expect_success 'the merge result must be a file' ' - test -f symlink + test_path_is_file symlink ' test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' ' @@ -56,7 +56,7 @@ test_expect_success 'merge b-file, which has a file instead of a symbolic link, ' test_expect_success 'the merge result must be a file' ' - test -f symlink + test_path_is_file symlink ' test_done |