From: Jeff King Date: Mon, 5 Nov 2018 06:40:53 +0000 (-0500) Subject: status: mark --find-renames option with NONEG X-Git-Tag: v2.20.0-rc0~23^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6627fb8999ac7275c1eeb42482dabd4fabfbd61;p=thirdparty%2Fgit.git status: mark --find-renames option with NONEG If you run "git status --no-find-renames", it will behave the same as "--find-renames", because we ignore the "unset" parameter (we see a NULL "arg", but since the score argument is optional, we just think that the user did not provide a score). We already have a separate "--no-renames" to disable renames, so there's not much point in supporting "--no-find-renames". Let's just flag it as an error. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/commit.c b/builtin/commit.c index 074bd9a551..4d7754ca43 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1335,7 +1335,7 @@ int cmd_status(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "no-renames", &no_renames, N_("do not detect renames")), { OPTION_CALLBACK, 'M', "find-renames", &rename_score_arg, N_("n"), N_("detect renames, optionally set similarity index"), - PARSE_OPT_OPTARG, opt_parse_rename_score }, + PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score }, OPT_END(), };