From a67e28116287ea84b162b22a5b69ec02ebd34023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Wed, 30 Dec 2009 21:11:44 +0700 Subject: grep: do not do external grep on skip-worktree entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skip-worktree entries are not on disk. We cannot use external grep in such cases. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin-grep.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/builtin-grep.c b/builtin-grep.c index 813fe9778..25ee75d98 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -357,6 +357,21 @@ static void grep_add_color(struct strbuf *sb, const char *escape_seq) strbuf_setlen(sb, sb->len - 1); } +static int has_skip_worktree_entry(struct grep_opt *opt, const char **paths) +{ + int nr; + for (nr = 0; nr < active_nr; nr++) { + struct cache_entry *ce = active_cache[nr]; + if (!S_ISREG(ce->ce_mode)) + continue; + if (!pathspec_matches(paths, ce->name, opt->max_depth)) + continue; + if (ce_skip_worktree(ce)) + return 1; + } + return 0; +} + static int external_grep(struct grep_opt *opt, const char **paths, int cached) { int i, nr, argc, hit, len, status; @@ -365,7 +380,8 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) char *argptr = randarg; struct grep_pat *p; - if (opt->extended || (opt->relative && opt->prefix_length)) + if (opt->extended || (opt->relative && opt->prefix_length) + || has_skip_worktree_entry(opt, paths)) return -1; len = nr = 0; push_arg("grep"); -- cgit v1.2.1