diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-24 09:32:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-24 09:32:33 -0700 |
| commit | f5f23a430f25fa956a87a9426791f4ee9055a5bf (patch) | |
| tree | 6af371655983d30cab7e91b33dac5b4c9f754e5e /t/t2400-worktree-add.sh | |
| parent | Git 2.42 (diff) | |
| parent | branch: error message checking out a branch in use (diff) | |
| download | git-f5f23a430f25fa956a87a9426791f4ee9055a5bf.tar.gz git-f5f23a430f25fa956a87a9426791f4ee9055a5bf.zip | |
Merge branch 'rj/branch-in-use-error-message'
A message written in olden time prevented a branch from getting
checked out saying it is already checked out elsewhere, but these
days, we treat a branch that is being bisected or rebased just like
a branch that is checked out and protect it. Rephrase the message
to say that the branch is in use.
* rj/branch-in-use-error-message:
branch: error message checking out a branch in use
branch: error message deleting a branch in use
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 051363acbb..df4aff7825 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 ) ' |