apply: use OPT_NOOP_NOARG
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Sep 28, 2011 at 19:47 UTC
af1032edf951b4f0f0b3811af4e34e26198a9ef8
1 file changed
+2
-7
builtin/apply.c
+2
-7
@@ -3831,7 +3831,6 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
3831
int i;
3832
int errs = 0;
3833
int is_not_gitdir = !startup_info->have_repository;
3834
- int binary;
3834
int force_apply = 0;
3835
3836
const char *whitespace_option = NULL;
@@ -3850,12 +3849,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
3849
"ignore additions made by the patch"),
3850
OPT_BOOLEAN(0, "stat", &diffstat,
3851
"instead of applying the patch, output diffstat for the input"),
3853
- { OPTION_BOOLEAN, 0, "allow-binary-replacement", &binary,
3854
- NULL, "old option, now no-op",
3855
- PARSE_OPT_HIDDEN | PARSE_OPT_NOARG },
3856
- { OPTION_BOOLEAN, 0, "binary", &binary,
3857
- NULL, "old option, now no-op",
3858
- PARSE_OPT_HIDDEN | PARSE_OPT_NOARG },
3852
+ OPT_NOOP_NOARG(0, "allow-binary-replacement"),
3853
+ OPT_NOOP_NOARG(0, "binary"),
3854
OPT_BOOLEAN(0, "numstat", &numstat,
3855
"shows number of added and deleted lines in decimal notation"),
3856
OPT_BOOLEAN(0, "summary", &summary,