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

diff --cc diff-lib.c
index f8454dd2918dc74bee43d9f2faa1837cc5665abd,12760b422f83e0c08d4ad9af5419318e9d47bcaa..ebe751e72d0ca9db2f0a9d2576f3dc3f41ffc31d
--- 1/diff-lib.c
--- 2/diff-lib.c
+++ b/diff-lib.c
@@@ -468,17 -463,10 +468,18 @@@ static int diff_cache(struct rev_info *
        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);
 -      if (unpack_trees(1, &t, &opts))
 +      return unpack_trees(1, &t, &opts);
 +}
 +
 +int run_diff_index(struct rev_info *revs, int cached)
 +{
 +      struct object_array_entry *ent;
 +
 +      ent = revs->pending.objects;
 +      if (diff_cache(revs, ent->item->sha1, ent->name, cached))
                exit(128);
  
        diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");

diff --cc unpack-trees.c
Simple merge

diff --cc unpack-trees.h
Simple merge