global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-05 06:57:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bk/t2003-modernise' into next

Browse Source 
Test update.

* bk/t2003-modernise:
  t2003: modernize path existence checks using test helpers
This commit is contained in:
Junio C Hamano
2026-02-10 12:40:04 -08:00
parent c1a50b2859 168d575719
commit 561a73205e
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
t/t2003-checkout-cache-mkdir.sh
View File

@@ -24,27 +24,28 @@ test_expect_success SYMLINKS 'have symlink in place where dir is expected.' '
mkdir path2 &&
ln -s path2 path1 &&
git checkout-index -f -a &&
test ! -h path1 && test -d path1 &&
test -f path1/file1 && test ! -f path2/file1
test_path_is_dir_not_symlink path1 &&
test_path_is_file path1/file1 &&
test_path_is_missing path2/file1
'
test_expect_success 'use --prefix=path2/' '
rm -fr path0 path1 path2 &&
mkdir path2 &&
git checkout-index --prefix=path2/ -f -a &&
test -f path2/path0 &&
test -f path2/path1/file1 &&
test ! -f path0 &&
test ! -f path1/file1
test_path_is_file path2/path0 &&
test_path_is_file path2/path1/file1 &&
test_path_is_missing path0 &&
test_path_is_missing path1/file1
'
test_expect_success 'use --prefix=tmp-' '
rm -fr path0 path1 path2 tmp* &&
git checkout-index --prefix=tmp- -f -a &&
test -f tmp-path0 &&
test -f tmp-path1/file1 &&
test ! -f path0 &&
test ! -f path1/file1
test_path_is_file tmp-path0 &&
test_path_is_file tmp-path1/file1 &&
test_path_is_missing path0 &&
test_path_is_missing path1/file1
'
test_expect_success 'use --prefix=tmp- but with a conflicting file and dir' '
@@ -52,10 +53,10 @@ test_expect_success 'use --prefix=tmp- but with a conflicting file and dir' '
echo nitfol >tmp-path1 &&
mkdir tmp-path0 &&
git checkout-index --prefix=tmp- -f -a &&
test -f tmp-path0 &&
test -f tmp-path1/file1 &&
test ! -f path0 &&
test ! -f path1/file1
test_path_is_file tmp-path0 &&
test_path_is_file tmp-path1/file1 &&
test_path_is_missing path0 &&
test_path_is_missing path1/file1
'
test_expect_success SYMLINKS 'use --prefix=tmp/orary/ where tmp is a symlink' '
@@ -63,10 +64,10 @@ test_expect_success SYMLINKS 'use --prefix=tmp/orary/ where tmp is a symlink' '
mkdir tmp1 tmp1/orary &&
ln -s tmp1 tmp &&
git checkout-index --prefix=tmp/orary/ -f -a &&
test -d tmp1/orary &&
test -f tmp1/orary/path0 &&
test -f tmp1/orary/path1/file1 &&
test -h tmp
test_path_is_dir tmp1/orary &&
test_path_is_file tmp1/orary/path0 &&
test_path_is_file tmp1/orary/path1/file1 &&
test_path_is_symlink tmp
'
test_expect_success SYMLINKS 'use --prefix=tmp/orary- where tmp is a symlink' '
@@ -74,9 +75,9 @@ test_expect_success SYMLINKS 'use --prefix=tmp/orary- where tmp is a symlink' '
mkdir tmp1 &&
ln -s tmp1 tmp &&
git checkout-index --prefix=tmp/orary- -f -a &&
test -f tmp1/orary-path0 &&
test -f tmp1/orary-path1/file1 &&
test -h tmp
test_path_is_file tmp1/orary-path0 &&
test_path_is_file tmp1/orary-path1/file1 &&
test_path_is_symlink tmp
'
test_expect_success SYMLINKS 'use --prefix=tmp- where tmp-path1 is a symlink' '
@@ -84,10 +85,9 @@ test_expect_success SYMLINKS 'use --prefix=tmp- where tmp-path1 is a symlink' '
mkdir tmp1 &&
ln -s tmp1 tmp-path1 &&
git checkout-index --prefix=tmp- -f -a &&
test -f tmp-path0 &&
test ! -h tmp-path1 &&
test -d tmp-path1 &&
test -f tmp-path1/file1
test_path_is_file tmp-path0 &&
test_path_is_dir_not_symlink tmp-path1 &&
test_path_is_file tmp-path1/file1
'
test_expect_success 'apply filter from working tree .gitattributes with --prefix' '