summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorNguyen Thai Ngoc Duy <pclouds@gmail.com>2012-01-15 10:03:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-16 22:17:18 (GMT)
commit4838237cb73a13d38a7e4348b71be96b60eed21e (patch)
tree111f332b68a6df462377a23a768ddd2fabc6a0c9 /diff-lib.c
parent8c69c1f92eb79a597225814781fdf1ab4be26758 (diff)
downloadgit-4838237cb73a13d38a7e4348b71be96b60eed21e.zip
git-4838237cb73a13d38a7e4348b71be96b60eed21e.tar.gz
git-4838237cb73a13d38a7e4348b71be96b60eed21e.tar.bz2
diff-index: enable recursive pathspec matching in unpack_trees
The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. 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 'diff-lib.c')
-rw-r--r--diff-lib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 62f4cd9..fc0dff3 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -469,6 +469,8 @@ static int diff_cache(struct rev_info *revs,
opts.src_index = &the_index;
opts.dst_index = NULL;
opts.pathspec = &revs->diffopt.pathspec;
+ opts.pathspec->recursive = 1;
+ opts.pathspec->max_depth = -1;
init_tree_desc(&t, tree->buffer, tree->size);
return unpack_trees(1, &t, &opts);