[PATCH 08/13] show-branch: mark --reflog option as NONEG
- From
Jeff King <peff@peff.net>
- Date
- Nov 5, 2018, 06:42 UTC
- Message-ID
- <20181105064240.GH25864@sigill.intra.peff.net>
- In-Reply-To
- <20181105063718.GA24877@sigill.intra.peff.net>
Running "git show-branch --no-reflog" will behave as if "--reflog" was given with no options, which makes no sense.
In theory this option might be used to cancel an earlier "--reflog" option, but the semantics are not clear. Let's punt on it and just disallow the broken option.
Signed-off-by: Jeff King <peff@peff.net> --- On most of these I tried to decide whether there was a sensible behavior, and actually do the fix. But I have to admit I have no idea how "show-branch -g" is supposed to work, which is the main reason I punted here. If somebody cares enough to write a patch, they can supersede this (but we should do something, because the current behavior is nonsense).
builtin/show-branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 65f4a4c83c..b1b540f7f6 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -674,7 +674,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"), N_("show <n> most recent ref-log entries starting at " "base"), - PARSE_OPT_OPTARG, + PARSE_OPT_OPTARG | PARSE_OPT_NONEG, parse_reflog_param }, OPT_END() };
-- 2.19.1.1505.g9cd28186cf