@matheusbsbs / matheus-bagliano / commits / 0ecd180a27

unpack-trees: simplify 'all other failures' case

In the 'if (current)' block of twoway_merge, we handle the boring errors by checking if the entry from the old tree, current index, and new tree are present, to get a pathname for the error message from one of them: if (oldtree) return o->gently ? -1 : reject_merge(oldtree, o); if (current) return o->gently ? -1 : reject_merge(current, o); if (newtree) return o->gently ? -1 : reject_merge(newtree, o); return -1; Since this is guarded by 'if (current)', the second test is guaranteed to succeed. Moreover, any of the three entries, if present, would have the same path because there is no rename detection in this code path. Even if some day in the future the entries' paths differ, the 'current' path used in the index and worktree would presumably be the most recognizable for the end user. Simplify by just using 'current'. Noticed by coverity, Id:290002 Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Aug 12, 2014 at 16:59 UTC 0ecd180a27eab7c576feddc6f2be0626a1e0630b

1 file changed +2 -10

unpack-trees.c

+2 -10

@@ -1791,16 +1791,8 @@ int twoway_merge(const struct cache_entry * const *src,

1791 /* 20 or 21 */

1792 return merged_entry(newtree, current, o);

1793 }

1794 - else {

1795 - /* all other failures */

1796 - if (oldtree)

1797 - return o->gently ? -1 : reject_merge(oldtree, o);

1798 - if (current)

1799 - return o->gently ? -1 : reject_merge(current, o);

1800 - if (newtree)

1801 - return o->gently ? -1 : reject_merge(newtree, o);

1802 - return -1;

1803 - }

1794 + else

1795 + return o->gently ? -1 : reject_merge(current, o);

1796 }

1797 else if (newtree) {

1798 if (oldtree && !o->initial_checkout) {