| commit | a5406125cc3989a7007d4fad7e5757cdb9837ebf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Oct 2016 16:01:16 +0000 (28 09:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Oct 2016 16:01:16 +0000 (28 09:01 -0700) | ||
| tree | bbd443e667513d2f72ca573e29d8df74acfd905d | treesnapshot (tar.gz zip) |
| parent | a42539f7de3f2516437fe4ee2d3bf769a27c89ab | commitdiff |
| parent | 171c646f8c6484cca76933ebe8a6af52df47277d | commitdiff |
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
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