From 40e372563cfbcce4380820ae03e872f09fa25327 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 29 Aug 2011 12:31:06 -0700 Subject: 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 --- unpack-trees.h | 1 + 1 file changed, 1 insertion(+) (limited to 'unpack-trees.h') diff --git a/unpack-trees.h b/unpack-trees.h index 64f02cb03a..b7fed7e6ec 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]; /* -- cgit v1.2.3