dir.c: export excluded_1() and add_excludes_from_file_1()

diff --git a/builtin-grep.c b/builtin-grep.c
index ad0e0a538539ff452d36f2e5776c39aa83c14137..813fe9778ae443edafac338d67299368631e821d 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -517,7 +517,7 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached,
                 * are identical, even if worktree file has been modified, so use
                 * cache version instead
                 */
-               if (cached || (ce->ce_flags & CE_VALID)) {
+               if (cached || (ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) {
                        if (ce_stage(ce))
                                continue;
                        hit |= grep_sha1(opt, ce->sha1, ce->name, 0);