aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-01-12 05:19:52 -0800
committerJunio C Hamano <gitster@pobox.com>2026-01-12 05:19:52 -0800
commit6506be0304db27fa6f15877a3e0d0cae0e49a178 (patch)
tree6e75d3f22f42ecb0eb7a6e77572b90f0bb85133e
parent3235ef374ea9808002b3304036c1b31965033ea0 (diff)
parent404b6772297c77f48de298adf11ab94f080eba72 (diff)
downloadgit-6506be0304db27fa6f15877a3e0d0cae0e49a178.tar.xz
Merge branch 'ps/t1300-2021-use-test-path-is-helpers'
Test updates. * ps/t1300-2021-use-test-path-is-helpers: t1300: use test helpers instead of `test` command
-rwxr-xr-xt/t1300-config.sh8
-rwxr-xr-xt/t2021-checkout-overwrite.sh4
2 files changed, 6 insertions, 6 deletions
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 358d636379..9850fcd5b5 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1232,12 +1232,12 @@ test_expect_success SYMLINKS 'symlinked configuration' '
test_when_finished "rm myconfig" &&
ln -s notyet myconfig &&
git config --file=myconfig test.frotz nitfol &&
- test -h myconfig &&
- test -f notyet &&
+ test_path_is_symlink myconfig &&
+ test_path_is_file notyet &&
test "z$(git config --file=notyet test.frotz)" = znitfol &&
git config --file=myconfig test.xyzzy rezrov &&
- test -h myconfig &&
- test -f notyet &&
+ test_path_is_symlink myconfig &&
+ test_path_is_file notyet &&
cat >expect <<-\EOF &&
nitfol
rezrov
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
index a5c03d5d4a..38c41ae373 100755
--- a/t/t2021-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -27,7 +27,7 @@ test_expect_success 'checkout commit with dir must not remove untracked a/b' '
git rm --cached a/b &&
git commit -m "un-track the file" &&
test_must_fail git checkout start &&
- test -f a/b
+ test_path_is_file a/b
'
test_expect_success 'create a commit where dir a/b changed to symlink' '
@@ -49,7 +49,7 @@ test_expect_success 'checkout commit with dir must not remove untracked a/b' '
test_expect_success SYMLINKS 'the symlink remained' '
- test -h a/b
+ test_path_is_symlink a/b
'
test_expect_success 'cleanup after previous symlink tests' '