From: Junio C Hamano Date: Wed, 26 Oct 2016 20:14:45 +0000 (-0700) Subject: Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' X-Git-Tag: v2.11.0-rc0~43 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e83d0531579da7abbfc603b5268995c2464efe8?hp=--cc Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' 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 --- 8e83d0531579da7abbfc603b5268995c2464efe8