summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Shourya Shukla <shouryashukla.oo@gmail.com>2020-01-18 14:03:26 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-21 13:57:42 -0800
commitc513a958b69090c02ad422b0cd4622009bb4b9f5 (patch)
treecf819a6b8459f4e752b0adf08d20350ade92b6ed
parentt6025: modernize style (diff)
downloadtgif-c513a958b69090c02ad422b0cd4622009bb4b9f5.tar.xz
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>
-rwxr-xr-xt/t6025-merge-symlinks.sh6
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