Merge branch 'as/grep-quiet-no-match-exit-code-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:13:12 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:13:12 +0000 (14:13 -0700)
"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

1  2 
grep.c
t/t7810-grep.sh

diff --cc grep.c
Simple merge
diff --cc t/t7810-grep.sh
Simple merge