diff options
| author | Rubén Justo <rjusto@gmail.com> | 2023-08-07 22:42:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-08 18:27:30 -0700 |
| commit | 2a499264d39c663517a8e4fe7f3abb55fc4a829a (patch) | |
| tree | 24b0b66bb3d64bb211dee17a1e80d63ed78c88c9 /t/t2400-worktree-add.sh | |
| parent | 92edf618709eaee1c3b42481cb478ed00eae1c2b (diff) | |
| download | git-2a499264d39c663517a8e4fe7f3abb55fc4a829a.tar.gz | |
branch: error message checking out a branch in use
Let's update the error message we show when the user tries to check out
a branch which is being used in another worktree, following the
guideline reasoned in 4970bedef2 (branch: update the message to refuse
touching a branch in-use, 2023-07-21).
Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2400-worktree-add.sh')
| -rwxr-xr-x | t/t2400-worktree-add.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index 0ac468e69e..a2483145fe 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -121,7 +121,8 @@ test_expect_success '"add" worktree creating new branch' ' test_expect_success 'die the same branch is already checked out' ' ( cd here && - test_must_fail git checkout newmain + test_must_fail git checkout newmain 2>actual && + grep "already used by worktree at" actual ) ' |