diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2011-09-28 19:47:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-28 12:46:32 -0700 |
| commit | 7cfc60576aeb25e2d234d47e9fd689a6c65ffd76 (patch) | |
| tree | c9edafd84c319b1c8db7d204a792b5416747600b | |
| parent | parseopt: add OPT_NOOP_NOARG (diff) | |
| download | tgif-7cfc60576aeb25e2d234d47e9fd689a6c65ffd76.tar.xz | |
revert: use OPT_NOOP_NOARG
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/revert.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 3117776c2c..db5b1d49cc 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -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), |