diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-20 11:43:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-20 11:43:25 -0800 |
| commit | cc14ea8cf4520a9607fba4b1fbacea7fa9723c73 (patch) | |
| tree | f5a5fb76eba752964fa48622cbce21f3b796f7f5 /builtin/grep.c | |
| parent | 7a450b48e765e957762b015f30c89f21b1028771 (diff) | |
| parent | 4d552005323034c1d6311796ac1074e9a4b4b57e (diff) | |
| download | git-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.tar.gz git-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.tar.xz | |
Merge branch 'nd/ita-cleanup'
Paths that have been told the index about with "add -N" are not
quite yet in the index, but a few commands behaved as if they
already are in a harmful way.
* nd/ita-cleanup:
grep: make it clear i-t-a entries are ignored
add and use a convenience macro ce_intent_to_add()
blame: remove obsolete comment
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 760dc8eae..06ab68223 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -386,7 +386,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int for (nr = 0; nr < active_nr; nr++) { const struct cache_entry *ce = active_cache[nr]; - if (!S_ISREG(ce->ce_mode)) + if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce)) continue; if (!ce_path_match(ce, pathspec, NULL)) continue; |