Re: [PATCH 8/9] worktree: teach 'remove' to override lock when --force given twice

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:40 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:25PM -0400, Eric Sunshine wrote: > > - N_("force removing even if the worktree is dirty"), > > + N_("force removal even if worktree is dirty or > > locked"), > > I wonder if

Re: [PATCH 8/9] worktree: teach 'remove' to override lock when --force given twice

2018-08-30 Thread Jeff King
On Tue, Aug 28, 2018 at 05:20:25PM -0400, Eric Sunshine wrote: > For consistency with "add -f -f" and "move -f -f" which override > the lock on a worktree, allow "remove -f -f" to do so, as well, as a > convenience. This one makes more sense to me than the last, since "remove -f" already does

[PATCH 8/9] worktree: teach 'remove' to override lock when --force given twice

2018-08-28 Thread Eric Sunshine
For consistency with "add -f -f" and "move -f -f" which override the lock on a worktree, allow "remove -f -f" to do so, as well, as a convenience. Signed-off-by: Eric Sunshine --- Documentation/git-worktree.txt | 1 + builtin/worktree.c | 11 ++- t/t2028-worktree-move.sh