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 /unpack-trees.c | |
| 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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 5a0f0382b8..be89d52e8c 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -116,7 +116,6 @@ static int unpack_index_entry(struct cache_entry *ce, struct unpack_trees_option add_entry(o, ce, 0, 0); return 0; } - return 0; } return call_unpack_fn(src, o); } @@ -286,7 +285,6 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str add_entry(o, ce, 0, 0); return mask; } - continue; } src[0] = ce; } |