From: Nguyễn Thái Ngọc Duy Date: Wed, 15 Dec 2010 15:02:52 GMT Subject: [PATCH 17/21] grep: use match_pathspec_depth() for cache/worktree grepping Message-ID: <1292425376-14550-18-git-send-email-pclouds@gmail.com> In-Reply-To: <1292425376-14550-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 4179af8..fbc7d02 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -595,7 +595,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int struct cache_entry *ce = active_cache[nr]; if (!S_ISREG(ce->ce_mode)) continue; - if (!pathspec_matches(pathspec->raw, ce->name, opt->max_depth)) + if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL)) continue; /* * If CE_VALID is on, we assume worktree file and its cache entry -- 1.7.3.3.476.g10a82