Re: [PATCH] revert: Hide '-r' option in default usage
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 11, 2011, 21:06 UTC
- Message-ID
- <7vhba4v6p8.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1302449954-15353-1-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 5 quoted lines
> Since the '-r' command-line option is a no-op provided only for > backward compatiblity, don't advertise it in the default usage. > > Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> > ---
Thanks.
It would have saved me a lot of time if you wrote that this option has been a no-op since abd6970 (cherry-pick: make -r the default, 2006-10-05), but the commit didn't remove it from the usage string, and it somehow survived 9509af6 (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and later f810379 (Make builtin-revert.c use parse_options, 2007-10-07), and it is about time to stop advertising it.
Show 19 quoted lines
> This is a minor detail I noticed while working on the sequencer.
>
> builtin/revert.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/revert.c b/builtin/revert.c
> index 2bb13eb..f697e66 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),