path: root/unpack-trees.h
diff options
authorJunio C Hamano <>2011-08-29 19:31:06 (GMT)
committerJunio C Hamano <>2011-08-29 22:08:31 (GMT)
commit40e372563cfbcce4380820ae03e872f09fa25327 (patch)
treeee2b3a45249377411570a420aa950327ff3bbd59 /unpack-trees.h
parent2842c0f914f7c05401c449db9d01276ac5a743f0 (diff)
unpack-trees: allow pruning with pathspec
Use the pathspec pruning of traverse_trees() from unpack_trees(). Again, the unpack_trees() machinery is primarily meant for merging two (or more) trees, and because a merge is a full tree operation, it didn't support any pruning with pathspec, and this codepath probably should not be enabled while running a merge, but the caller in diff-lib.c::diff_cache() should be able to take advantage of it. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'unpack-trees.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 64f02cb..b7fed7e 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -51,6 +51,7 @@ struct unpack_trees_options {
const char *prefix;
int cache_bottom;
struct dir_struct *dir;
+ struct pathspec *pathspec;
merge_fn_t fn;
const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];