]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/checkout-B-branch-in-use'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2023 22:52:24 +0000 (14:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2023 22:52:24 +0000 (14:52 -0800)
commitf09e74175dfa5b46587dab3c5dcbad16e9586de3
tree98626534b7796b0deb7948757fc5ec78b58166b2
parent055bb6e9969085777b7fab83e3fee0017654f134
parentb23285a921a84c3b83d9aaca31afedf290c59254
Merge branch 'jc/checkout-B-branch-in-use'

"git checkout -B <branch> [<start-point>]" allowed a branch that is
in use in another worktree to be updated and checked out, which
might be a bit unexpected.  The rule has been tightened, which is a
breaking change.  "--ignore-other-worktrees" option is required to
unbreak you, if you are used to the current behaviour that "-B"
overrides the safety.

* jc/checkout-B-branch-in-use:
  checkout: forbid "-B <branch>" from touching a branch used elsewhere
  checkout: refactor die_if_checked_out() caller
builtin/checkout.c
t/t2400-worktree-add.sh