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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 4 | ||||
| -rw-r--r-- | builtin/grep.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 9836e6b7ca..61653466a6 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -647,9 +647,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) "Output full tree for each commit"), OPT_BOOLEAN(0, "use-done-feature", &use_done_feature, "Use the done feature to terminate the stream"), - { OPTION_NEGBIT, 0, "data", &no_data, NULL, - "Skip output of blob data", - PARSE_OPT_NOARG | PARSE_OPT_NEGHELP, NULL, 1 }, + OPT_BOOL(0, "no-data", &no_data, "Skip output of blob data"), OPT_END() }; diff --git a/builtin/grep.c b/builtin/grep.c index a286692e46..461d1c2465 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -777,8 +777,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_BOOLEAN(0, "cached", &cached, "search in index instead of in the work tree"), - OPT_BOOLEAN(0, "index", &use_index, - "--no-index finds in contents not managed by git"), + OPT_NEGBIT(0, "no-index", &use_index, + "finds in contents not managed by git", 1), OPT_GROUP(""), OPT_BOOLEAN('v', "invert-match", &opt.invert, "show non-matching lines"), |