summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 21:13:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-23 21:13:12 (GMT)
commit85c81a74e24fd83bbe7a75aa4ce6a5b3dfa1b884 (patch)
treec295552653e67bf20c475d955d78756a82c19f23
parentc3e034f0f0753126494285d1098e1084ec05d2c4 (diff)
parente1f68c66d575e09f325f3eda9ced1b2f4ef4b4f0 (diff)
downloadgit-85c81a74e24fd83bbe7a75aa4ce6a5b3dfa1b884.zip
git-85c81a74e24fd83bbe7a75aa4ce6a5b3dfa1b884.tar.gz
git-85c81a74e24fd83bbe7a75aa4ce6a5b3dfa1b884.tar.bz2
Merge branch 'as/grep-quiet-no-match-exit-code-fix'
"git grep -L" and "git grep --quiet -L" reported different exit codes; this has been corrected. * as/grep-quiet-no-match-exit-code-fix: git-grep: correct exit code with --quiet and -L
-rw-r--r--grep.c2
-rwxr-xr-xt/t7810-grep.sh5
2 files changed, 6 insertions, 1 deletions
diff --git a/grep.c b/grep.c
index 45acd33..ce6a48e 100644
--- a/grep.c
+++ b/grep.c
@@ -1821,7 +1821,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
return 0;
if (opt->status_only)
- return 0;
+ return opt->unmatch_name_only;
if (opt->unmatch_name_only) {
/* We did not see any hit, so we want to show this */
show_name(opt, gs->name);
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index f106387..2a6679c 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -374,6 +374,11 @@ test_expect_success 'grep -L -C' '
test_cmp expected actual
'
+test_expect_success 'grep --files-without-match --quiet' '
+ git grep --files-without-match --quiet nonexistent_string >actual &&
+ test_cmp /dev/null actual
+'
+
cat >expected <<EOF
file:foo mmap bar_mmap
EOF