From 9d8b831b36ca936f05e381e0f7f7a4b0d76114ee Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 16 Feb 2011 14:39:00 -0800 Subject: [PATCH] grep --no-index: honor pathspecs correctly Even though fill_directory() takes pathspec, the returned set of paths is not guaranteed to be free of paths outside the pathspec. Perhaps we would need to change that, but the current API is that the caller needs to further filter them. Signed-off-by: Junio C Hamano --- builtin/grep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builtin/grep.c b/builtin/grep.c index c3af8760c..5afee2f3a 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -626,6 +626,10 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec) fill_directory(&dir, pathspec->raw); for (i = 0; i < dir.nr; i++) { + const char *name = dir.entries[i]->name; + int namelen = strlen(name); + if (!match_pathspec_depth(pathspec, name, namelen, 0, NULL)) + continue; hit |= grep_file(opt, dir.entries[i]->name); if (hit && opt->status_only) break; -- 2.30.2