global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ps/t1300-2021-use-test-path-is-helpers' into next

Browse Source 
Test updates.

* ps/t1300-2021-use-test-path-is-helpers:
  t1300: use test helpers instead of `test` command
This commit is contained in:
Junio C Hamano
2026-01-05 15:53:23 +09:00
parent 8b44eff694 404b677229
commit c9366fe5a0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t1300-config.sh
View File

@@ -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

4
t/t2021-checkout-overwrite.sh
View File

@@ -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' '