From: Jeff King Date: Mon, 5 Nov 2018 06:41:12 +0000 (-0500) Subject: format-patch: mark "--no-numbered" option with NONEG X-Git-Tag: v2.20.0-rc0~23^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=964fd83b12cbf7907f0bdb4671a467fe381487d3;p=git format-patch: mark "--no-numbered" option with NONEG We have separate parse-options entries for "numbered" and "no-numbered", which means that we accept "--no-no-numbered". It does not behave sensibly, though (it ignores the "unset" flag and acts like "--no-numbered"). We could fix that, but obviously this is silly and unintentional. Let's just disallow it. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/log.c b/builtin/log.c index 061d4fd864..41188e723c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1508,7 +1508,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) PARSE_OPT_NOARG, numbered_callback }, { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL, N_("use [PATCH] even with multiple patches"), - PARSE_OPT_NOARG, no_numbered_callback }, + PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback }, OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")), OPT_BOOL(0, "stdout", &use_stdout, N_("print patches to standard out")),