diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-23 15:00:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-13 07:48:17 -0800 |
| commit | b23285a921a84c3b83d9aaca31afedf290c59254 (patch) | |
| tree | 9d60e7089e73328124c9b6603547e3dd6769ac3f /diff-lib.c | |
| parent | checkout: refactor die_if_checked_out() caller (diff) | |
| download | git-b23285a921a84c3b83d9aaca31afedf290c59254.tar.gz git-b23285a921a84c3b83d9aaca31afedf290c59254.zip | |
checkout: forbid "-B <branch>" from touching a branch used elsewhere
"git checkout -B <branch> [<start-point>]", being a "forced" version
of "-b", switches to the <branch>, after optionally resetting its
tip to the <start-point>, even if the <branch> is in use in another
worktree, which is somewhat unexpected.
Protect the <branch> using the same logic that forbids "git checkout
<branch>" from touching a branch that is in use elsewhere.
This is a breaking change that may deserve backward compatibliity
warning in the Release Notes. The "--ignore-other-worktrees" option
can be used as an escape hatch if the finger memory of existing
users depend on the current behaviour of "-B".
Reported-by: Willem Verstraeten <willem.verstraeten@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions