Linus Torvalds 20a16eb33e 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>

2008-03-10 23:51:13 -07:00

18 KiB

Raw Blame History

View Raw