| commit | 20a16eb33eee99fd3eab00c72f012b98d4eeee76 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 11 Mar 2008 06:51:13 +0000 (10 23:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Mar 2008 06:51:13 +0000 (10 23:51 -0700) | ||
| tree | 6d02e3516df996f58f8f00b94ea9cf634f6701c8 | treesnapshot (tar.gz zip) |
| parent | 542c264b01ac551dca0697d6577ec71ad4c245ab | commitdiff |
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>
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 | diffblobblamehistory | |
| unpack-trees.c | diffblobblamehistory |