Merge branch 'nd/fixup-linked-gitdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:53 +0000 (19:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:53 +0000 (19:17 -0700)
commitd6c196abfd992a884a2e1ae1275b2abfac6f6d76
tree19b50a61f2bd10c8f4a0c666a15a49ef664d424b
parente654e3b574bf1e4cc7556c2f01188eaf41271901
parent82fde87ff3be8d10854df18964e5816417a1d7cf
Merge branch 'nd/fixup-linked-gitdir' into maint

The code in "multiple-worktree" support that attempted to recover
from an inconsistent state updated an incorrect file.

* nd/fixup-linked-gitdir:
  setup: update the right file in multiple checkouts