| Message ID | 20181105064053.GF25864@sigill.intra.peff.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | parseopt fixes from -Wunused-parameters | expand |
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(), };
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 <peff@peff.net> --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)