summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-28 20:33:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-28 20:33:42 (GMT)
commit4ff61c21de519b4b3c9569b354fa5a3905b69c6a (patch)
tree1b0829332583d5d39eeaaee2a1b566edc3504df1
parent12a258c078da3481a5735a7dca00bbe75cd4713b (diff)
downloadgit-4ff61c21de519b4b3c9569b354fa5a3905b69c6a.zip
git-4ff61c21de519b4b3c9569b354fa5a3905b69c6a.tar.gz
git-4ff61c21de519b4b3c9569b354fa5a3905b69c6a.tar.bz2
grep --quiet: finishing touches
Name the option "--quiet" not "--quick", document it, and add tests. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-grep.txt7
-rw-r--r--builtin-grep.c2
-rwxr-xr-xt/t7002-grep.sh8
3 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index abb6735..e019e76 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -16,7 +16,7 @@ SYNOPSIS
[-F | --fixed-strings] [-n]
[-l | --files-with-matches] [-L | --files-without-match]
[-z | --null]
- [-c | --count] [--all-match]
+ [-c | --count] [--all-match] [-q | --quiet]
[--max-depth <depth>]
[--color | --no-color]
[-A <post-context>] [-B <pre-context>] [-C <context>]
@@ -158,6 +158,11 @@ OPTIONS
this flag is specified to limit the match to files that
have lines to match all of them.
+-q::
+--quiet::
+ Do not output matched lines; instead, exit with status 0 when
+ there is a match and with non-zero status when there isn't.
+
`<tree>...`::
Search blobs in the trees for specified patterns.
diff --git a/builtin-grep.c b/builtin-grep.c
index 6cc743d..9bd467c 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -832,7 +832,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
{ OPTION_CALLBACK, ')', NULL, &opt, NULL, "",
PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
close_callback },
- OPT_BOOLEAN('q', "quick", &opt.status_only,
+ OPT_BOOLEAN('q', "quiet", &opt.status_only,
"indicate hit with exit status without output"),
OPT_BOOLEAN(0, "all-match", &opt.all_match,
"show only matches from files that match all patterns"),
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 7eceb08..bf4d4dc 100755
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -291,6 +291,14 @@ y:y yy
z:zzz
EOF
+test_expect_success 'grep -q, silently report matches' '
+ >empty &&
+ git grep -q mmap >actual &&
+ test_cmp empty actual &&
+ test_must_fail git grep -q qfwfq >actual &&
+ test_cmp empty actual
+'
+
# Create 1024 file names that sort between "y" and "z" to make sure
# the two files are handled by different calls to an external grep.
# This depends on MAXARGS in builtin-grep.c being 1024 or less.