]> git.ipfire.org Git - thirdparty/git.git/commit - t/t1308-config-set.sh
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)
commitd3f2e4ab13f54ec3de1ac752e41d30847974c140
treeef572432380f00901850fa6032314ad83e2b0b60
parent5bc069e383539824fd3a0d897100d44bbe1f8a24
parent3521c6321350cf1432f4772efa09db8bec0aa331
Merge branch 'rj/branch-unborn-in-other-worktrees'

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
branch.c
builtin/branch.c
t/t3200-branch.sh