summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-12-15 15:02:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-03 22:08:30 (GMT)
commitbc96cc87dbb229cbdabfd93391e24ef168713a74 (patch)
tree9ff90a888efab369476fe4003fe1e36fa0fbd9ba /tree-diff.c
parent58c4d66619eb21fa23a1305401e0ec4988c1c17e (diff)
downloadgit-bc96cc87dbb229cbdabfd93391e24ef168713a74.zip
git-bc96cc87dbb229cbdabfd93391e24ef168713a74.tar.gz
git-bc96cc87dbb229cbdabfd93391e24ef168713a74.tar.bz2
tree_entry_interesting(): support depth limit
This is needed to replace pathspec_matches() in builtin/grep.c. max_depth == -1 means infinite depth. Depth limit is only effective when pathspec.recursive == 1. When pathspec.recursive == 0, the behavior depends on match functions: non-recursive for tree_entry_interesting() and recursive for match_pathspec{,_depth} Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 45a3845..03dc5c8 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -146,6 +146,10 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
int all_t1_interesting = 0;
int all_t2_interesting = 0;
+ /* Enable recursion indefinitely */
+ opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);
+ opt->pathspec.max_depth = -1;
+
strbuf_init(&base, PATH_MAX);
strbuf_add(&base, base_str, baselen);