summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 19:35:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-05 19:35:53 (GMT)
commit1b840a56629c8c0620c261672cc5d4d35ba253fa (patch)
tree38691399a0fc7bb3bc5eac7f5e8b80dadbad573a /diff-lib.c
parent2c4610393195cc6f35ea79efadbc5c7fd7470891 (diff)
parent2f88c19700feb8db8f116f94bf558e61c82d543c (diff)
downloadgit-1b840a56629c8c0620c261672cc5d4d35ba253fa.zip
git-1b840a56629c8c0620c261672cc5d4d35ba253fa.tar.gz
git-1b840a56629c8c0620c261672cc5d4d35ba253fa.tar.bz2
Merge branch 'jc/diff-index-unpack'
* jc/diff-index-unpack: diff-index: pass pathspec down to unpack-trees machinery unpack-trees: allow pruning with pathspec traverse_trees(): allow pruning with pathspec
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c
index f8454dd..ebe751e 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -468,6 +468,7 @@ static int diff_cache(struct rev_info *revs,
opts.unpack_data = revs;
opts.src_index = &the_index;
opts.dst_index = NULL;
+ opts.pathspec = &revs->diffopt.pathspec;
init_tree_desc(&t, tree->buffer, tree->size);
return unpack_trees(1, &t, &opts);