author | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Aug 2011 19:31:06 +0000 (12:31 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Aug 2011 22:08:31 +0000 (15:08 -0700) | ||
commit | 40e372563cfbcce4380820ae03e872f09fa25327 | |
tree | ee2b3a45249377411570a420aa950327ff3bbd59 | tree | snapshot |
parent | 2842c0f914f7c05401c449db9d01276ac5a743f0 | commit | 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 <gitster@pobox.com>
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 <gitster@pobox.com>
unpack-trees.c | diff | blob | history | |
unpack-trees.h | diff | blob | history |