[PATCH 2/3] revert: use OPT_NOOP_NOARG
From: René Scharfe <hidden>
Date: 2016-06-15 22:52:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Rene Scharfe <redacted> --- builtin/revert.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 3117776..db5b1d4 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),
--
1.7.7.rc2