From: Junio C Hamano Date: Fri, 28 Oct 2016 16:01:16 +0000 (-0700) Subject: Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint X-Git-Tag: v2.10.2~14 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a5406125cc3989a7007d4fad7e5757cdb9837ebf Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint In a worktree connected to a repository elsewhere, created via "git worktree", "git checkout" attempts to protect users from confusion by refusing to check out a branch that is already checked out in another worktree. However, this also prevented checking out a branch, which is designated as the primary branch of a bare reopsitory, in a worktree that is connected to the bare repository. The check has been corrected to allow it. * dk/worktree-dup-checkout-with-bare-is-ok: worktree: allow the main brach of a bare repository to be checked out --- a5406125cc3989a7007d4fad7e5757cdb9837ebf