diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-06-04 16:43:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-06 13:25:34 -0700 |
| commit | 34aec9f573af8e6fbe06285d660d9e1a84950e4c (patch) | |
| tree | 86b8e29169d7b03dcedd30cdd1faaadc4b225125 /builtin-apply.c | |
| parent | e3a0ca878457ecc70d0065802fcb0c6875c6b671 (diff) | |
| download | git-34aec9f573af8e6fbe06285d660d9e1a84950e4c.tar.gz git-34aec9f573af8e6fbe06285d660d9e1a84950e4c.tar.xz | |
parse-options: simplify usage argh handling
Simplify the argh printing by simply calling usage_argh() if the option
can take an argument. Update macros defined in parse-options.h to set
the PARSE_OPT_NOARG flag.
The only other user of custom non-argument taking options is git-apply
(in this case OPTION_BOOLEAN for deprecated options). Update it to set
the PARSE_OPT_NOARG flag.
Thanks to Ren辿 Scharfe for the suggestion and starter patch.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Reviewd-by: René 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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 94ba2bdd5..89a5185ce 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -3277,9 +3277,11 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) 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 }, + 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 }, + NULL, "old option, now no-op", + PARSE_OPT_HIDDEN | PARSE_OPT_NOARG }, OPT_BOOLEAN(0, "numstat", &numstat, "shows number of added and deleted lines in decimal notation"), OPT_BOOLEAN(0, "summary", &summary, |