]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rj/avoid-switching-to-already-used-branch'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:11 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:11 +0000 (15:03 -0700)
A few subcommands have been taught to stop users from working on a
branch that is being used in another worktree linked to the same
repository.

* rj/avoid-switching-to-already-used-branch:
  switch: reject if the branch is already checked out elsewhere (test)
  rebase: refuse to switch to a branch already checked out elsewhere (test)
  branch: fix die_if_checked_out() when ignore_current_worktree
  worktree: introduce is_shared_symref()

1  2 
branch.c
worktree.c
worktree.h

diff --cc branch.c
Simple merge
diff --cc worktree.c
Simple merge
diff --cc worktree.h
Simple merge