]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'rj/branch-in-use-error-message'
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2023 16:32:32 +0000 (09:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2023 16:32:33 +0000 (09:32 -0700)
commitf5f23a430f25fa956a87a9426791f4ee9055a5bf
tree6af371655983d30cab7e91b33dac5b4c9f754e5e
parent43c8a30d150ecede9709c1f2527c8fba92c65f40
parent2a499264d39c663517a8e4fe7f3abb55fc4a829a
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
builtin/branch.c
t/t2400-worktree-add.sh