[PATCH 17/21] grep: use match_pathspec_depth() for cache/worktree grepping

view
thread

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?=

Subject: [PATCH 17/21] grep: use match_pathspec_depth() for cache/worktree grepping

Date: Wednesday, December 15, 2010 - 8:02 am

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

[PATCH 00/21] nd/struct-pathspec v2, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 01/21] Add struct pathspec, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 02/21] diff-no-index: use diff_tree_setup_paths(), =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 03/21] Convert struct diff_options to use struct pa ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 04/21] tree_entry_interesting(): remove dependency ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 05/21] Move tree_entry_interesting() to tree-walk.c ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 06/21] glossary: define pathspec, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 07/21] diff-tree: convert base+baselen to writable ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 08/21] tree_entry_interesting(): refactor into sepa ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 09/21] tree_entry_interesting(): support depth limit, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 10/21] tree_entry_interesting(): fix depth limit wi ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 11/21] tree_entry_interesting(): support wildcard m ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 12/21] tree_entry_interesting(): optimize wildcard ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 13/21] pathspec: add match_pathspec_depth(), =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 14/21] Convert ce_path_match() to use struct pathspec, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 15/21] Convert ce_path_match() to use match_pathspe ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 16/21] grep: convert to use struct pathspec, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 17/21] grep: use match_pathspec_depth() for cache/w ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 18/21] strbuf: allow "buf" to point to the middle o ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 19/21] grep: use writable strbuf from caller in gre ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 20/21] grep: drop pathspec_matches() in favor of tr ..., =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

[PATCH 21/21] t7810: overlapping pathspecs and depth limit, =?UTF-8?q?Nguy=E1=BB ..., (Wed Dec 15, 8:02 am)

Re: [PATCH 10/21] tree_entry_interesting(): fix depth limi ..., Junio C Hamano, (Thu Dec 16, 4:31 pm)

Re: [PATCH 14/21] Convert ce_path_match() to use struct pa ..., Junio C Hamano, (Thu Dec 16, 5:02 pm)

Re: [PATCH 19/21] grep: use writable strbuf from caller in ..., Junio C Hamano, (Thu Dec 16, 5:15 pm)

Re: [PATCH 19/21] grep: use writable strbuf from caller in ..., Nguyen Thai Ngoc Duy, (Fri Dec 17, 2:56 am)

Re: [PATCH 14/21] Convert ce_path_match() to use struct pa ..., Nguyen Thai Ngoc Duy, (Fri Dec 17, 2:59 am)

Re: [PATCH 10/21] tree_entry_interesting(): fix depth limi ..., Nguyen Thai Ngoc Duy, (Fri Dec 17, 3:05 am)

[PATCH 14/21] struct rev_info: convert prune_data to struc ..., =?UTF-8?q?Nguy=E1=BB ..., (Fri Dec 17, 5:43 am)

[PATCH 15/21] Convert ce_path_match() to use struct pathspec, =?UTF-8?q?Nguy=E1=BB ..., (Fri Dec 17, 5:43 am)

[PATCH 19/21] grep: use writable strbuf from caller for gr ..., =?UTF-8?q?Nguy=E1=BB ..., (Fri Dec 17, 5:44 am)

[PATCH 20/21] grep: drop pathspec_matches() in favor of tr ..., =?UTF-8?q?Nguy=E1=BB ..., (Fri Dec 17, 5:45 am)

Re: [PATCH 14/21] Convert ce_path_match() to use struct pa ..., Junio C Hamano, (Fri Dec 17, 8:09 am)

Re: [PATCH 14/21] Convert ce_path_match() to use struct pa ..., Nguyen Thai Ngoc Duy, (Fri Dec 17, 8:11 am)

Re: [PATCH 10/21] tree_entry_interesting(): fix depth limi ..., Junio C Hamano, (Fri Dec 17, 1:02 pm)

Re: [PATCH 14/21] Convert ce_path_match() to use struct pa ..., Junio C Hamano