Code

revert: use OPT_NOOP_NOARG
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Wed, 28 Sep 2011 17:47:50 +0000 (19:47 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Sep 2011 19:46:32 +0000 (12:46 -0700)
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/revert.c

index 3117776c2c030bec03563f043c4dc8bb34eb17cd..db5b1d49cc5f7143279c90d0234e17b1646c9b8b 100644 (file)
@@ -72,12 +72,10 @@ static int option_parse_x(const struct option *opt,
 static void parse_args(int argc, const char **argv)
 {
        const char * const * usage_str = revert_or_cherry_pick_usage();
-       int noop;
        struct option options[] = {
                OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
                OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"),
-               { OPTION_BOOLEAN, 'r', NULL, &noop, NULL, "no-op (backward compatibility)",
-                 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 0 },
+               OPT_NOOP_NOARG('r', NULL),
                OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
                OPT_INTEGER('m', "mainline", &mainline, "parent number"),
                OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),