From: René Scharfe Date: Wed, 28 Sep 2011 17:47:54 +0000 (+0200) Subject: apply: use OPT_NOOP_NOARG X-Git-Tag: v1.7.8-rc0~95^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af1032edf951b4f0f0b3811af4e34e26198a9ef8;p=git.git apply: use OPT_NOOP_NOARG Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- diff --git a/builtin/apply.c b/builtin/apply.c index f2edc5281..872e40ab1 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,