From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jul 2016 18:25:51 +0000 (-0700)
Subject: Merge branch 'nd/ita-cleanup' into maint
X-Git-Tag: v2.9.3~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c12c71fabb3598a480111a31c151bc787cdced30;p=thirdparty%2Fgit.git

Merge branch 'nd/ita-cleanup' into maint

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

c12c71fabb3598a480111a31c151bc787cdced30