diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-12-30 21:11:44 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-30 23:10:53 -0800 |
| commit | a67e28116287ea84b162b22a5b69ec02ebd34023 (patch) | |
| tree | d6f70a63ce235b46a8b0ce497d7e731c8ec8243e | |
| parent | 7fce6e3c9a3cf652099ee5f0e52b59c407692044 (diff) | |
| download | git-a67e28116287ea84b162b22a5b69ec02ebd34023.tar.gz | |
grep: do not do external grep on skip-worktree entries
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 <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-grep.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 813fe9778a..25ee75d989 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"); |