1. Stefan Saasen
  2. git


Junio C Hamano  committed 4ff61c2

grep --quiet: finishing touches

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

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

  • Participants
  • Parent commits 12a258c
  • Branches master

Comments (0)

Files changed (3)

File Documentation/git-grep.txt

View file
 	   [-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>]
 	this flag is specified to limit the match to files that
 	have lines to match all of them.
+	Do not output matched lines; instead, exit with status 0 when
+	there is a match and with non-zero status when there isn't.
 	Search blobs in the trees for specified patterns.

File builtin-grep.c

View file
 		{ OPTION_CALLBACK, ')', NULL, &opt, NULL, "",
 		  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"),

File t/t7002-grep.sh

View file
+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.