From: Nguyễn Thái Ngọc Duy Date: Sun, 14 Sep 2008 13:07:59 GMT Subject: [PATCH 10/16] grep: skip files that have not been checked out Message-ID: <1221397685-27715-11-git-send-email-pclouds@gmail.com> In-Reply-To: <1221397685-27715-10-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin-grep.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/builtin-grep.c b/builtin-grep.c index 3a51662..d5507d7 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -343,6 +343,8 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) continue; if (!pathspec_matches(paths, ce->name)) continue; + if (ce_no_checkout(ce)) + continue; name = ce->name; if (name[0] == '-') { int len = ce_namelen(ce); @@ -404,8 +406,11 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached) continue; hit |= grep_sha1(opt, ce->sha1, ce->name, 0); } - else + else { + if (ce_no_checkout(ce)) + continue; hit |= grep_file(opt, ce->name); + } if (ce_stage(ce)) { do { nr++; -- 1.6.0.96.g2fad1.dirty