Re: [PATCH 8/9] worktree: teach 'remove' to override lock when --force given twice
- From
Jeff King <peff@peff.net>
- Date
- Aug 30, 2018, 07:40 UTC
- Message-ID
- <20180830074033.GE11944@sigill.intra.peff.net>
- In-Reply-To
- <20180828212026.21989-9-sunshine@sunshineco.com>
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 something useful.
Show 10 quoted lines
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index 354a6c0eb5..a95fe67da6 100644
> --- a/builtin/worktree.c
> +++ b/builtin/worktree.c
> @@ -875,13 +875,13 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
> int force = 0;
> struct option options[] = {
> OPT__FORCE(&force,
> - N_("force removing even if the worktree is dirty"),
> + N_("force removal even if worktree is dirty or locked"),I wonder if somebody might assume from this that a single "-f" would override a lock. Perhaps not the end of the world, and the manpage does make it clear. And also I don't really know how to be more specific here without an overly long line.
I'm guessing all those thoughts went through your head before ending up here, too. :)
-Peff