Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: > On Tue, Apr 17, 2018 at 2:19 PM, Stefan Beller <sbeller@xxxxxxxxxx> wrote: >> The force flag is very common in many commands and is commonly >> abbreviated with '-f', so add that to worktree removal, too by using >> OPT__FORCE instead of a self cooked OPT_BOOL for force. > > The missing bit of this sentence: > > ...self cooked OPT_BOOL for force which forgets '-f'. > >> While at it, add the PARSE_OPT_NOCOMPLETE flag to the force command line >> option as forcing a removal may lose files. >> >> The short form of "-f" is already documented in the man page, >> so we do not have to adjust the docs. > > Makes sense. A possible rewrite (of the entire commit message): > > worktree: remove: recognize -f as short for --force > > Many commands support a --force option, frequently abbreviated as > -f, however, "git worktree remove"'s hand-rolled OPT_BOOL forgets > to recognize the short form, despite git-worktree.txt documenting > -f as supported. Replace OPT_BOOL with OPT__FORCE, which provides > -f for free, and makes 'remove' consistent with 'add' option > parsing (which also specifies the PARSE_OPT_NOCOMPLETE flag). > >> Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx> >> Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> Looks better. I am not sure if s/--force/-f/ in the synopsis section is warranted, but '-f' is commonly understood as '--force' (and that is the point of this patch after all), so it is probably an improvement to be briefer. Thanks, both. > > The patch itself looks good. Thanks. With or without the above rewrite > or minor adjustment, this patch is: > > Reviewed-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
