development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch: reject if the branch is already checked out elsewhere (test)

Browse source 
Since 5883034 (checkout: reject if the branch is already checked out
elsewhere) in normal use, we do not allow multiple worktrees having the
same checked out branch.

A bug has recently been fixed that caused this to not work as expected.

Let's add a test to notice if this changes in the future.

Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rubén Justo 2023-02-25 15:22:23 +01:00 committed by Junio C Hamano
parent 279f42fa27
commit 894ea94509
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
t/t2060-switch.sh
View file

@ -146,4 +146,33 @@ test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
test_cmp_config "" --default "" branch.main2.merge
'
test_expect_success 'switch back when temporarily detached and checked out elsewhere ' '
test_when_finished "
git worktree remove wt1 ||:
git worktree remove wt2 ||:
git checkout - ||:
git branch -D shared ||:
" &&
git checkout -b shared &&
test_commit shared-first &&
HASH1=$(git rev-parse --verify HEAD) &&
test_commit shared-second &&
test_commit shared-third &&
HASH2=$(git rev-parse --verify HEAD) &&
git worktree add wt1 -f shared &&
git -C wt1 bisect start &&
git -C wt1 bisect good $HASH1 &&
git -C wt1 bisect bad $HASH2 &&
git worktree add wt2 -f shared &&
git -C wt2 bisect start &&
git -C wt2 bisect good $HASH1 &&
git -C wt2 bisect bad $HASH2 &&
# we test in both worktrees to ensure that works
# as expected with "first" and "next" worktrees
test_must_fail git -C wt1 switch shared &&
git -C wt1 switch --ignore-other-worktrees shared &&
test_must_fail git -C wt2 switch shared &&
git -C wt2 switch --ignore-other-worktrees shared
'
test_done