Re: [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-07 Thread Mark Levedahl
On 07/06/2015 03:40 PM, Junio C Hamano wrote: If you are extending the history of some branch, then you would want to be on that branch. Why would you want to have another worktree that will get into a confusing state once you create that commit on the checked out branch in this newly created w

Re: [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-07 Thread Eric Sunshine
On Tue, Jul 7, 2015 at 12:20 PM, Junio C Hamano wrote: > Eric Sunshine writes: > I would not mind "git worktree add -f" to disable the "no multiple > checkouts of the same branch" safety, but I do not think it is > sensible to remove "-i-o-w" and conflate everything into "--force". > That would f

Re: [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-07 Thread Junio C Hamano
Eric Sunshine writes: > Is receive.denyCurrentBranch worth mentioning as an argument? Although > pushing a branch into a non-bare repo where that branch is already > checked out is normally disallowed, receive.denyCurrentBranch > overrides the safeguard. Presumably, the user has experience and >

Re: [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-07 Thread Eric Sunshine
On Tue, Jul 7, 2015 at 4:24 AM, Eric Sunshine wrote: > On Mon, Jul 6, 2015 at 3:40 PM, Junio C Hamano wrote: >> If you are extending the history of some branch, then you would want >> to be on that branch. Why would you want to have another worktree >> that will get into a confusing state once y

Re: [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-07 Thread Eric Sunshine
On Mon, Jul 6, 2015 at 3:40 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> As a safeguard, checking out a branch already checked out by a different >> worktree is disallowed. This behavior can be overridden with >> --ignore-other-worktrees, however, this option is neither obvious nor >> par

Re: [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-06 Thread Junio C Hamano
Eric Sunshine writes: > As a safeguard, checking out a branch already checked out by a different > worktree is disallowed. This behavior can be overridden with > --ignore-other-worktrees, however, this option is neither obvious nor > particularly discoverable. As a common safeguard override, --fo

[PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force

2015-07-06 Thread Eric Sunshine
As a safeguard, checking out a branch already checked out by a different worktree is disallowed. This behavior can be overridden with --ignore-other-worktrees, however, this option is neither obvious nor particularly discoverable. As a common safeguard override, --force is more likely to come to mi