summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2012-02-28 19:06:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-28 19:48:11 (GMT)
commitcbb08c2e0b41ab162838aa1e83b959bac91151e2 (patch)
treeb762ff44c1e2a83fe44ba2fc9cb174222efd8cc2 /builtin/grep.c
parent0f1930c58754a821bd51087ca4676e6a69cd4d2b (diff)
downloadgit-cbb08c2e0b41ab162838aa1e83b959bac91151e2.zip
git-cbb08c2e0b41ab162838aa1e83b959bac91151e2.tar.gz
git-cbb08c2e0b41ab162838aa1e83b959bac91151e2.tar.bz2
parse-options: remove PARSE_OPT_NEGHELP
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/grep.c')
-rw-r--r--builtin/grep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index a286692..461d1c2 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"),