diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-12 23:34:15 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 23:34:15 +0400 |
| commit | af543833d4e10163af8045859cc081969fa5fcec (patch) | |
| tree | 8d131837c007202fa2e733996c8b5384fe73bde5 /builtin/revert.c | |
| parent | fbca6911dedd58136d27bff452c3ccdf48c82779 (diff) | |
| parent | af1032edf951b4f0f0b3811af4e34e26198a9ef8 (diff) | |
Merge branch 'jc/parse-options-boolean'
* jc/parse-options-boolean:
apply: use OPT_NOOP_NOARG
revert: use OPT_NOOP_NOARG
parseopt: add OPT_NOOP_NOARG
archive.c: use OPT_BOOL()
parse-options: deprecate OPT_BOOLEAN
Conflicts:
builtin/revert.c
Diffstat (limited to 'builtin/revert.c')
| -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 200149e2e7..010508d571 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -133,7 +133,6 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) { const char * const * usage_str = revert_or_cherry_pick_usage(opts); const char *me = action_name(opts); - int noop; int reset = 0; int contin = 0; struct option options[] = { @@ -141,8 +140,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_BOOLEAN(0, "continue", &contin, "continue the current operation"), OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"), OPT_BOOLEAN('e', "edit", &opts->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", &opts->signoff, "add Signed-off-by:"), OPT_INTEGER('m', "mainline", &opts->mainline, "parent number"), OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto), |