From 5e31075a19acdd242996c83728b3c8e965af0d7b Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 10 Apr 2011 21:09:14 +0530 Subject: [PATCH] revert: Hide '-r' option in default usage The '-r' command-line option is a no-op provided only for backward compatiblity since abd6970 (cherry-pick: make -r the default, 2006-10-05), and somehow ended up surviving across reimplementation in C at 9509af6 (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and another rewrite of the command line parser at f810379 (Make builtin-revert.c use parse_options, 2007-10-07). We should have stopped advertising the option long time ago. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano --- builtin/revert.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/revert.c b/builtin/revert.c index 2bb13ebb1d..f697e66953 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -76,7 +76,8 @@ static void parse_args(int argc, const char **argv) struct option options[] = { OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"), OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"), - OPT_BOOLEAN('r', NULL, &noop, "no-op (backward compatibility)"), + { OPTION_BOOLEAN, 'r', NULL, &noop, NULL, "no-op (backward compatibility)", + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 0 }, OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), OPT_INTEGER('m', "mainline", &mainline, "parent number"), OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), -- 2.11.4.GIT