undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: refuse to switch to a branch already checked out elsewhere (test)

Browse Source 
In b5cabb4a9 (rebase: refuse to switch to branch already checked out
elsewhere, 2020-02-23) we add a condition to prevent a rebase operation
involving a switch to a branch that is already checked out in another
worktree.

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:13 +01:00 committed by Junio C Hamano
parent faa4d5983b
commit 279f42fa27
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/t3400-rebase.sh
View File

@ -388,6 +388,20 @@ test_expect_success 'switch to branch checked out here' '
git rebase main main git rebase main main
' '
test_expect_success 'switch to branch checked out elsewhere fails' '
test_when_finished "
git worktree remove wt1 &&
git worktree remove wt2 &&
git branch -d shared
" &&
git worktree add wt1 -b shared &&
git worktree add wt2 -f shared &&
# we test in both worktrees to ensure that works
# as expected with "first" and "next" worktrees
test_must_fail git -C wt1 rebase shared shared &&
test_must_fail git -C wt2 rebase shared shared
'
test_expect_success 'switch to branch not checked out' ' test_expect_success 'switch to branch not checked out' '
git checkout main && git checkout main &&
git branch other && git branch other &&