Merge branch 'nd/worktree-kill-parse-ref'
commit79553b94f966f3cec6156a68001650ca26a584c4
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:23 +0000 (10 17:08 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:24 +0000 (10 17:08 +0900)
tree37c0d1de2d26a28d67e06993819e8965dd25e942
parent5064d66f5bd86de2f8d5a4b021a616af57f5d8fa
parent31824d180d4f975e6b130cd9a33a9a0baef3d7ca
Merge branch 'nd/worktree-kill-parse-ref'

"git branch -M a b" while on a branch that is completely unrelated
to either branch a or branch b misbehaved when multiple worktree
was in use.  This has been fixed.

* nd/worktree-kill-parse-ref:
  branch: fix branch renaming not updating HEADs correctly
branch.c
t/t3200-branch.sh
worktree.c