averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

t2400: replace 'test -[efd]' with 'test_path_is_*'

Browse Source 
'test_path_is_file', 'test_path_is_dir' and 'test_file_is_missing'
are test helpers used in Git's development, that emit useful
diagnostic information when they detect a failing condition, while
test -[efd] does not.

Replace the basic shell commands 'test -f', 'test -d' and 'test -e',
with these test helpers.

Co-authored-by: Isabella Caselli <icaselli@usp.br>
Signed-off-by: Isabella Caselli <icaselli@usp.br>
Signed-off-by: Rodrigo Michelassi <rodmichelassi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rodrigo Michelassi
2025-06-16 21:29:39 -03:00
committed by Junio C Hamano
parent f93ff170b9
commit 855cfc65ae
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
t/t2400-worktree-add.sh
View File

@@ -42,8 +42,8 @@ test_expect_success '"add" using - shorthand' '
test_expect_success '"add" refuses to checkout locked branch' ' test_expect_success '"add" refuses to checkout locked branch' '
test_must_fail git worktree add zere main && test_must_fail git worktree add zere main &&
! test -d zere && test_path_is_missing zere &&
! test -d .git/worktrees/zere test_path_is_missing .git/worktrees/zere
' '
test_expect_success 'checking out paths not complaining about linked checkouts' ' test_expect_success 'checking out paths not complaining about linked checkouts' '
@@ -70,14 +70,14 @@ test_expect_success '"add" worktree' '
test_expect_success '"add" worktree with lock' ' test_expect_success '"add" worktree with lock' '
git worktree add --detach --lock here-with-lock main && git worktree add --detach --lock here-with-lock main &&
test_when_finished "git worktree unlock here-with-lock || :" && test_when_finished "git worktree unlock here-with-lock || :" &&
test -f .git/worktrees/here-with-lock/locked test_path_is_file .git/worktrees/here-with-lock/locked
' '
test_expect_success '"add" worktree with lock and reason' ' test_expect_success '"add" worktree with lock and reason' '
lock_reason="why not" && lock_reason="why not" &&
git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main && git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main &&
test_when_finished "git worktree unlock here-with-lock-reason || :" && test_when_finished "git worktree unlock here-with-lock-reason || :" &&
test -f .git/worktrees/here-with-lock-reason/locked && test_path_is_file .git/worktrees/here-with-lock-reason/locked &&
echo "$lock_reason" >expect && echo "$lock_reason" >expect &&
test_cmp expect .git/worktrees/here-with-lock-reason/locked test_cmp expect .git/worktrees/here-with-lock-reason/locked
' '
@@ -412,14 +412,14 @@ test_expect_success '"add --orphan" with empty repository' '
test_expect_success '"add" worktree with orphan branch and lock' ' test_expect_success '"add" worktree with orphan branch and lock' '
git worktree add --lock --orphan -b orphanbr orphan-with-lock && git worktree add --lock --orphan -b orphanbr orphan-with-lock &&
test_when_finished "git worktree unlock orphan-with-lock || :" && test_when_finished "git worktree unlock orphan-with-lock || :" &&
test -f .git/worktrees/orphan-with-lock/locked test_path_is_file .git/worktrees/orphan-with-lock/locked
' '
test_expect_success '"add" worktree with orphan branch, lock, and reason' ' test_expect_success '"add" worktree with orphan branch, lock, and reason' '
lock_reason="why not" && lock_reason="why not" &&
git worktree add --detach --lock --reason "$lock_reason" orphan-with-lock-reason main && git worktree add --detach --lock --reason "$lock_reason" orphan-with-lock-reason main &&
test_when_finished "git worktree unlock orphan-with-lock-reason || :" && test_when_finished "git worktree unlock orphan-with-lock-reason || :" &&
test -f .git/worktrees/orphan-with-lock-reason/locked && test_path_is_file .git/worktrees/orphan-with-lock-reason/locked &&
echo "$lock_reason" >expect && echo "$lock_reason" >expect &&
test_cmp expect .git/worktrees/orphan-with-lock-reason/locked test_cmp expect .git/worktrees/orphan-with-lock-reason/locked
' '
@@ -474,7 +474,7 @@ test_expect_success 'local clone --shared from linked checkout' '
test_expect_success '"add" worktree with --no-checkout' ' test_expect_success '"add" worktree with --no-checkout' '
git worktree add --no-checkout -b swamp swamp && git worktree add --no-checkout -b swamp swamp &&
! test -e swamp/init.t && test_path_is_missing swamp/init.t &&
git -C swamp reset --hard && git -C swamp reset --hard &&
test_cmp init.t swamp/init.t test_cmp init.t swamp/init.t
' '
@@ -497,7 +497,7 @@ test_expect_success 'put a worktree under rebase' '
test_expect_success 'add a worktree, checking out a rebased branch' ' test_expect_success 'add a worktree, checking out a rebased branch' '
test_must_fail git worktree add new-rebase under-rebase && test_must_fail git worktree add new-rebase under-rebase &&
! test -d new-rebase test_path_is_missing new-rebase
' '
test_expect_success 'checking out a rebased branch from another worktree' ' test_expect_success 'checking out a rebased branch from another worktree' '
@@ -535,7 +535,7 @@ test_expect_success 'checkout a branch under bisect' '
git worktree list >actual && git worktree list >actual &&
grep "under-bisect.*detached HEAD" actual && grep "under-bisect.*detached HEAD" actual &&
test_must_fail git worktree add new-bisect under-bisect && test_must_fail git worktree add new-bisect under-bisect &&
! test -d new-bisect test_path_is_missing new-bisect
) )
' '
@@ -1165,7 +1165,7 @@ test_expect_success '"add" not tripped up by magic worktree matching"' '
test_expect_success FUNNYNAMES 'sanitize generated worktree name' ' test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
git worktree add --detach ". weird*..?.lock.lock" && git worktree add --detach ". weird*..?.lock.lock" &&
test -d .git/worktrees/---weird-.- test_path_is_dir .git/worktrees/---weird-.-
' '
test_expect_success '"add" should not fail because of another bad worktree' ' test_expect_success '"add" should not fail because of another bad worktree' '