eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 13:23:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

t2401: update path checks using test_path helpers

Browse Source 
Update old-style shell path checks to use the modern test
helpers 'test_path_is_file' and 'test_path_is_dir' for improved
runtime diagnosis.

Signed-off-by: Solly <solobarine@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Solly 2025-10-15 15:03:29 +01:00 committed by Junio C Hamano
parent c44beea485
commit 0c4f1346ca
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
t/t2401-worktree-prune.sh
View File

@ -24,8 +24,8 @@ test_expect_success 'prune files inside $GIT_DIR/worktrees' '
Removing worktrees/abc: not a valid directory Removing worktrees/abc: not a valid directory
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
! test -f .git/worktrees/abc && test_path_is_missing .git/worktrees/abc &&
! test -d .git/worktrees test_path_is_missing .git/worktrees
' '
test_expect_success 'prune directories without gitdir' ' test_expect_success 'prune directories without gitdir' '
@ -36,8 +36,8 @@ Removing worktrees/def: gitdir file does not exist
EOF EOF
git worktree prune --verbose 2>actual && git worktree prune --verbose 2>actual &&
test_cmp expect actual && test_cmp expect actual &&
! test -d .git/worktrees/def && test_path_is_missing .git/worktrees/def &&
! test -d .git/worktrees test_path_is_missing .git/worktrees
' '
test_expect_success SANITY 'prune directories with unreadable gitdir' ' test_expect_success SANITY 'prune directories with unreadable gitdir' '
@ -47,8 +47,8 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' '
chmod u-r .git/worktrees/def/gitdir && chmod u-r .git/worktrees/def/gitdir &&
git worktree prune --verbose 2>actual && git worktree prune --verbose 2>actual &&
test_grep "Removing worktrees/def: unable to read gitdir file" actual && test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
! test -d .git/worktrees/def && test_path_is_missing .git/worktrees/def &&
! test -d .git/worktrees test_path_is_missing .git/worktrees
' '
test_expect_success 'prune directories with invalid gitdir' ' test_expect_success 'prune directories with invalid gitdir' '
@ -57,8 +57,8 @@ test_expect_success 'prune directories with invalid gitdir' '
: >.git/worktrees/def/gitdir && : >.git/worktrees/def/gitdir &&
git worktree prune --verbose 2>actual && git worktree prune --verbose 2>actual &&
test_grep "Removing worktrees/def: invalid gitdir file" actual && test_grep "Removing worktrees/def: invalid gitdir file" actual &&
! test -d .git/worktrees/def && test_path_is_missing .git/worktrees/def &&
! test -d .git/worktrees test_path_is_missing .git/worktrees
' '
test_expect_success 'prune directories with gitdir pointing to nowhere' ' test_expect_success 'prune directories with gitdir pointing to nowhere' '
@ -67,8 +67,8 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' '
echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir && echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
git worktree prune --verbose 2>actual && git worktree prune --verbose 2>actual &&
test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual && test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
! test -d .git/worktrees/def && test_path_is_missing .git/worktrees/def &&
! test -d .git/worktrees test_path_is_missing .git/worktrees
' '
test_expect_success 'not prune locked checkout' ' test_expect_success 'not prune locked checkout' '
@ -76,23 +76,23 @@ test_expect_success 'not prune locked checkout' '
mkdir -p .git/worktrees/ghi && mkdir -p .git/worktrees/ghi &&
: >.git/worktrees/ghi/locked && : >.git/worktrees/ghi/locked &&
git worktree prune && git worktree prune &&
test -d .git/worktrees/ghi test_path_is_dir .git/worktrees/ghi
' '
test_expect_success 'not prune recent checkouts' ' test_expect_success 'not prune recent checkouts' '
test_when_finished rm -r .git/worktrees && test_when_finished rm -r .git/worktrees &&
git worktree add jlm HEAD && git worktree add jlm HEAD &&
test -d .git/worktrees/jlm && test_path_is_dir .git/worktrees/jlm &&
rm -rf jlm && rm -rf jlm &&
git worktree prune --verbose --expire=2.days.ago && git worktree prune --verbose --expire=2.days.ago &&
test -d .git/worktrees/jlm test_path_is_dir .git/worktrees/jlm
' '
test_expect_success 'not prune proper checkouts' ' test_expect_success 'not prune proper checkouts' '
test_when_finished rm -r .git/worktrees && test_when_finished rm -r .git/worktrees &&
git worktree add --detach "$PWD/nop" main && git worktree add --detach "$PWD/nop" main &&
git worktree prune && git worktree prune &&
test -d .git/worktrees/nop test_path_is_dir .git/worktrees/nop
' '
test_expect_success 'prune duplicate (linked/linked)' ' test_expect_success 'prune duplicate (linked/linked)' '
@ -103,8 +103,8 @@ test_expect_success 'prune duplicate (linked/linked)' '
mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir && mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
git worktree prune --verbose 2>actual && git worktree prune --verbose 2>actual &&
test_grep "duplicate entry" actual && test_grep "duplicate entry" actual &&
test -d .git/worktrees/w1 && test_path_is_dir .git/worktrees/w1 &&
! test -d .git/worktrees/w2 test_path_is_missing .git/worktrees/w2
' '
test_expect_success 'prune duplicate (main/linked)' ' test_expect_success 'prune duplicate (main/linked)' '
@ -116,7 +116,7 @@ test_expect_success 'prune duplicate (main/linked)' '
mv repo wt && mv repo wt &&
git -C wt worktree prune --verbose 2>actual && git -C wt worktree prune --verbose 2>actual &&
test_grep "duplicate entry" actual && test_grep "duplicate entry" actual &&
! test -d .git/worktrees/wt test_path_is_missing .git/worktrees/wt
' '
test_expect_success 'not prune proper worktrees inside linked worktree with relative paths' ' test_expect_success 'not prune proper worktrees inside linked worktree with relative paths' '