]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rj/branch-unborn-in-other-worktrees'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 May 2023 20:59:02 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 May 2023 20:59:03 +0000 (13:59 -0700)
Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.

* rj/branch-unborn-in-other-worktrees:
  branch: avoid unnecessary worktrees traversals
  branch: rename orphan branches in any worktree
  branch: description for orphan branch errors
  branch: use get_worktrees() in copy_or_rename_branch()
  branch: test for failures while renaming branches

1  2 
branch.c
builtin/branch.c
t/t3200-branch.sh

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