mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 21:14:17 +01:00
Code

Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2017-09-10 17:02:55 +09:00
commit f1b64e8e64
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grep.c
View File

@ -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);

5
t/t7810-grep.sh
View File

@ -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