diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2011-09-28 19:47:54 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-28 12:46:34 -0700 |
| commit | af1032edf951b4f0f0b3811af4e34e26198a9ef8 (patch) | |
| tree | 23ffe60a6fb30fda4d9352c9cdda311992a01e37 /builtin/apply.c | |
| parent | revert: use OPT_NOOP_NOARG (diff) | |
| download | tgif-af1032edf951b4f0f0b3811af4e34e26198a9ef8.tar.xz | |
apply: use OPT_NOOP_NOARG
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index f2edc52818..872e40ab1e 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3831,7 +3831,6 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) int i; int errs = 0; int is_not_gitdir = !startup_info->have_repository; - int binary; int force_apply = 0; const char *whitespace_option = NULL; @@ -3850,12 +3849,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) "ignore additions made by the patch"), OPT_BOOLEAN(0, "stat", &diffstat, "instead of applying the patch, output diffstat for the input"), - { OPTION_BOOLEAN, 0, "allow-binary-replacement", &binary, - NULL, "old option, now no-op", - PARSE_OPT_HIDDEN | PARSE_OPT_NOARG }, - { OPTION_BOOLEAN, 0, "binary", &binary, - NULL, "old option, now no-op", - PARSE_OPT_HIDDEN | PARSE_OPT_NOARG }, + OPT_NOOP_NOARG(0, "allow-binary-replacement"), + OPT_NOOP_NOARG(0, "binary"), OPT_BOOLEAN(0, "numstat", &numstat, "shows number of added and deleted lines in decimal notation"), OPT_BOOLEAN(0, "summary", &summary, |