| commit | 8e83d0531579da7abbfc603b5268995c2464efe8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2016 20:14:45 +0000 (26 13:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2016 20:14:45 +0000 (26 13:14 -0700) | ||
| tree | 243be5479322bdf43bbf1ee96c311991dca7bee6 | treesnapshot (tar.gz zip) |
| parent | 56d268bafff7538f82c01d3c9c07bdc54b2993b1 | commitdiff |
| parent | 171c646f8c6484cca76933ebe8a6af52df47277d | commitdiff |
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
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