From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jan 2010 20:33:42 +0000 (-0800)
Subject: grep --quiet: finishing touches
X-Git-Tag: v1.7.0-rc1~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ff61c21de519b4b3c9569b354fa5a3905b69c6a;p=git.git

grep --quiet: finishing touches

Name the option "--quiet" not "--quick", document it, and add tests.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index abb6735a4..e019e760b 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 6cc743d7c..9bd467c9b 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 7eceb086b..bf4d4dcb2 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.