t6020, t6022, t6035: update merge tests to use test helper functions

[thirdparty/git.git] / t / t6035-merge-dir-to-symlink.sh

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index 9324ea44162130c0eea4dcc08d21866354e3c1da..2eddcc7664e82a8e6bdf35518876c8915e1f541a 100755 (executable)
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -31,19 +31,19 @@ test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
        git rm --cached a/b &&
        git commit -m "untracked symlink remains" &&
        git checkout -f start^0 &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'checkout should not have deleted a/b-2/c/d' '
        git checkout HEAD^0 &&
        git reset --hard master &&
         git checkout start^0 &&
-        test -f a/b-2/c/d
+        test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'setup for merge test' '
        git reset --hard &&
-       test -f a/b-2/c/d &&
+       test_path_is_file a/b-2/c/d &&
        echo x > a/x &&
        git add a/x &&
        git commit -m x &&
@@ -54,7 +54,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolv
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -65,7 +65,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recurs
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s recursive master &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -76,7 +76,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv
        git reset --hard &&
        git checkout master^0 &&
        git merge -s resolve baseline^0 &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -87,7 +87,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recurs
        git reset --hard &&
        git checkout master^0 &&
        git merge -s recursive baseline^0 &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -99,8 +99,8 @@ test_expect_failure 'do not lose untracked in merge (resolve)' '
        git checkout baseline^0 &&
        >a/b/c/e &&
        test_must_fail git merge -s resolve master &&
-       test -f a/b/c/e &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b/c/e &&
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'do not lose untracked in merge (recursive)' '
@@ -108,8 +108,8 @@ test_expect_success 'do not lose untracked in merge (recursive)' '
        git checkout baseline^0 &&
        >a/b/c/e &&
        test_must_fail git merge -s recursive master &&
-       test -f a/b/c/e &&
-       test -f a/b-2/c/d
+       test_path_is_file a/b/c/e &&
+       test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'do not lose modifications in merge (resolve)' '
@@ -140,7 +140,7 @@ test_expect_success 'merge should not have D/F conflicts (resolve)' '
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve test2 &&
-       test -f a/b/c/d
+       test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@@ -151,7 +151,7 @@ test_expect_success 'merge should not have D/F conflicts (recursive)' '
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s recursive test2 &&
-       test -f a/b/c/d
+       test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@@ -162,7 +162,7 @@ test_expect_success 'merge should not have F/D conflicts (recursive)' '
        git reset --hard &&
        git checkout -b foo test2 &&
        git merge -s recursive baseline^0 &&
-       test -f a/b/c/d
+       test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '