projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f34bbc1
)
grep: use match_pathspec_depth() for cache/worktree grepping
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Wed, 15 Dec 2010 15:02:52 +0000
(22:02 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 3 Feb 2011 22:08:30 +0000
(14:08 -0800)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/grep.c
patch
|
blob
|
history
diff --git
a/builtin/grep.c
b/builtin/grep.c
index ad9ec4a29967bccc1c63447003acb75df94ef0f6..16a2fde9477c4c99f0342f156c4e767ef253c203 100644
(file)
--- a/
builtin/grep.c
+++ b/
builtin/grep.c
@@
-591,7
+591,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