projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 542c264) | patch
unpack_trees(): fix diff-index regression.
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Mar 2008 06:51:13 +0000 (23:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 06:51:13 +0000 (23:51 -0700)
commit20a16eb33eee99fd3eab00c72f012b98d4eeee76
tree6d02e3516df996f58f8f00b94ea9cf634f6701c8tree | snapshot
parent542c264b01ac551dca0697d6577ec71ad4c245abcommit | diff
unpack_trees(): fix diff-index regression.

When skip_unmerged option is not given, unpack_trees() should not just
skip unmerged cache entries but keep them in the result for the caller to
sort them out.

For callers other than diff-index, the incoming index should never be
unmerged, but diff-index is a special case caller.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-lib.c diff | blob | blame | history
unpack-trees.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.