diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-08-12 11:25:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-08-12 11:25:34 -0700 |
| commit | 7d7ee2ee0359232139b810190566a5e78d59a179 (patch) | |
| tree | 96508c73b389fdb34a7c0cae4c9772a446e4b250 | |
| parent | 4f1870801c8b993e25aa0ead8250d580953207a1 (diff) | |
| download | git-sb/unpack-trees-dead-code-removal.tar.gz | |
SQUASH???sb/unpack-trees-dead-code-removal
| -rw-r--r-- | unpack-trees.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 6bc0b280f5..5cbb467285 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1791,15 +1791,11 @@ int twoway_merge(const struct cache_entry * const *src, /* 20 or 21 */ return merged_entry(newtree, current, o); } - else { - /* all other failures */ - if (oldtree) - return o->gently ? -1 : reject_merge(oldtree, o); - if (newtree) - return o->gently ? -1 : reject_merge(newtree, o); - /* current is definitely exists here */ - return o->gently ? -1 : reject_merge(current, o); - } + /* all other failures */ + else if (o->gently) + return -1; + else + return reject_merge(current, o); } else if (newtree) { if (oldtree && !o->initial_checkout) { |