| commit | 42bd66816bd117ed5e6d15f38dbe9e655ebc76a5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2016 18:24:17 +0000 (13 11:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2016 18:24:18 +0000 (13 11:24 -0700) | ||
| tree | 171137a5689f92dca06938be5842a567f7d164cf | treesnapshot (tar.gz zip) |
| parent | 5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc | commitdiff |
| parent | b8e47d1acfa299299d1120241bdc6164867d1289 | commitdiff |
Merge branch 'nd/ita-cleanup'
Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path, but that
logic does not apply to "git grep", i.e. searching in the working
tree files. But we did so by mistake, which has been corrected.
* nd/ita-cleanup:
grep: fix grepping for "intent to add" files
t7810-grep.sh: fix a whitespace inconsistency
t7810-grep.sh: fix duplicated test name
Git does not know what the contents in the index should be for a
path added with "git add -N" yet, so "git grep --cached" should not
show hits (or show lack of hits, with -L) in such a path, but that
logic does not apply to "git grep", i.e. searching in the working
tree files. But we did so by mistake, which has been corrected.
* nd/ita-cleanup:
grep: fix grepping for "intent to add" files
t7810-grep.sh: fix a whitespace inconsistency
t7810-grep.sh: fix duplicated test name
| builtin/grep.c | diff1 | diff2 | blobhistory |
| t/t7810-grep.sh | diff1 | diff2 | blobhistory |