Merge branch 'ky/branch-m-worktree' into maint
commit3c383a30c854232b2a678110dd191b639a8b7989
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:05 +0000 (2 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:05 +0000 (2 14:24 -0700)
tree2cb164e470ca962978422638f86e42899c4fb23b
parenta4127142c621c03cb0967d298ac0ea1e673162fd
parent18eb3a9ce7c544e74d424b942c5a5c9720c20112
Merge branch 'ky/branch-m-worktree' into maint

When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
  set_worktree_head_symref(): fix error message
  branch -m: update all per-worktree HEADs
  refs: add a new function set_worktree_head_symref
builtin/branch.c
t/t3200-branch.sh