diff options
| author | Anthony Sottile <asottile@umich.edu> | 2017-08-17 18:38:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-17 19:02:23 -0700 |
| commit | e1f68c66d575e09f325f3eda9ced1b2f4ef4b4f0 (patch) | |
| tree | 4b267159f350ad35be2a068509f4da11d04c799f | |
| parent | 3d9c5b5c4461957fbbc0479e037990db04ebb740 (diff) | |
| download | git-as/grep-quiet-no-match-exit-code-fix.tar.gz | |
git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fix
The handling of `status_only` no longer interferes with the handling of
`unmatch_name_only`. `--quiet` no longer affects the exit code when using
`-L`/`--files-without-match`.
Signed-off-by: Anthony Sottile <asottile@umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | grep.c | 2 | ||||
| -rwxr-xr-x | t/t7810-grep.sh | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -1629,7 +1629,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 cee42097b0..7395038f7e 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -370,6 +370,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 |