diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 21:35:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 21:35:53 +0200 |
| commit | 1b840a56629c8c0620c261672cc5d4d35ba253fa (patch) | |
| tree | 38691399a0fc7bb3bc5eac7f5e8b80dadbad573a /diff-lib.c | |
| parent | Merge branch 'mm/rebase-i-exec-edit' (diff) | |
| parent | diff-index: pass pathspec down to unpack-trees machinery (diff) | |
| download | git-1b840a56629c8c0620c261672cc5d4d35ba253fa.tar.xz git-1b840a56629c8c0620c261672cc5d4d35ba253fa.zip | |
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.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); |