diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
| commit | fc26f57b847b86ba330ea543a6dfc86a10d4cce3 (patch) | |
| tree | 91e48380bbabaa47699db38c00c5c056d6ea48d2 /diff-lib.c | |
| parent | 57ded055c419183e43fd7841c1f9d2e774fa96e3 (diff) | |
| parent | 2f88c19700feb8db8f116f94bf558e61c82d543c (diff) | |
| download | git-fc26f57b847b86ba330ea543a6dfc86a10d4cce3.tar.gz | |
Merge branch 'jc/diff-index-unpack' into maint
* 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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index f8454dd291..ebe751e72d 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); |