diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-02-28 20:06:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-28 11:48:11 -0800 |
| commit | cbb08c2e0b41ab162838aa1e83b959bac91151e2 (patch) | |
| tree | b762ff44c1e2a83fe44ba2fc9cb174222efd8cc2 /parse-options.c | |
| parent | 0f1930c58754a821bd51087ca4676e6a69cd4d2b (diff) | |
| download | git-cbb08c2e0b41ab162838aa1e83b959bac91151e2.tar.gz | |
parse-options: remove PARSE_OPT_NEGHELPrs/no-no-no-parseopt
PARSE_OPT_NEGHELP is confusing because short options defined with that
flag do the opposite of what the helptext says. It is also not needed
anymore now that options starting with no- can be negated by removing
that prefix. Convert its only two users to OPT_NEGBIT() and OPT_BOOL()
and then remove support for PARSE_OPT_NEGHELP.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/parse-options.c b/parse-options.c index 8906841665..190899611e 100644 --- a/parse-options.c +++ b/parse-options.c @@ -533,7 +533,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx, continue; pos = fprintf(outfile, " "); - if (opts->short_name && !(opts->flags & PARSE_OPT_NEGHELP)) { + if (opts->short_name) { if (opts->flags & PARSE_OPT_NODASH) pos += fprintf(outfile, "%c", opts->short_name); else @@ -542,9 +542,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx, if (opts->long_name && opts->short_name) pos += fprintf(outfile, ", "); if (opts->long_name) - pos += fprintf(outfile, "--%s%s", - (opts->flags & PARSE_OPT_NEGHELP) ? "no-" : "", - opts->long_name); + pos += fprintf(outfile, "--%s", opts->long_name); if (opts->type == OPTION_NUMBER) pos += fprintf(outfile, "-NUM"); |