unpack-trees: use 'cuddled' style for if-else cascade
Match the predominant style in git by following K&R style for if/else cascades. Documentation/CodingStyle from linux.git explains: Note that the closing brace is empty on a line of its own, _except_ in the cases where it is followed by a continuation of the same statement, ie a "while" in a do-statement or an "else" in an if-statement, like this: if (x == y) { .. } else if (x > y) { ... } else { .... } Rationale: K&R. Also, note that this brace-placement also minimizes the number of empty (or almost empty) lines, without any loss of readability. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 12, 2014 at 17:00 UTC
6c1db1b38886f70165cb9f5822b1a2e99a2c331b
1 file changed
+4
-8
unpack-trees.c
+4
-8
@@ -1771,8 +1771,7 @@ int twoway_merge(const struct cache_entry * const *src,
1771
return merged_entry(newtree, current, o);
1772
}
1773
return o->gently ? -1 : reject_merge(current, o);
1774
- }
1775
- else if ((!oldtree && !newtree) || /* 4 and 5 */
1774
+ } else if ((!oldtree && !newtree) || /* 4 and 5 */
1775
(!oldtree && newtree &&
1776
same(current, newtree)) || /* 6 and 7 */
1777
(oldtree && newtree &&
@@ -1781,17 +1780,14 @@ int twoway_merge(const struct cache_entry * const *src,
1780
!same(oldtree, newtree) && /* 18 and 19 */
1781
same(current, newtree))) {
1782
return keep_entry(current, o);
1784
- }
1785
- else if (oldtree && !newtree && same(current, oldtree)) {
1783
+ } else if (oldtree && !newtree && same(current, oldtree)) {
1784
/* 10 or 11 */
1785
return deleted_entry(oldtree, current, o);
1788
- }
1789
- else if (oldtree && newtree &&
1786
+ } else if (oldtree && newtree &&
1787
same(current, oldtree) && !same(current, newtree)) {
1788
/* 20 or 21 */
1789
return merged_entry(newtree, current, o);
1793
- }
1794
- else
1790
+ } else
1791
return o->gently ? -1 : reject_merge(current, o);
1792
}
1793
else if (newtree) {