diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-10 23:51:13 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-10 23:51:13 -0700 |
| commit | 20a16eb33eee99fd3eab00c72f012b98d4eeee76 (patch) | |
| tree | 6d02e3516df996f58f8f00b94ea9cf634f6701c8 /t/t3402-rebase-merge.sh | |
| parent | traverse_trees_recursive(): propagate merge errors up (diff) | |
| download | tgif-20a16eb33eee99fd3eab00c72f012b98d4eeee76.tar.xz | |
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>
Diffstat (limited to 't/t3402-rebase-merge.sh')
0 files changed, 0 insertions, 0 deletions