[PATCH v3] diffcore-break: use a goto instead of a redundant if statement

[Alex Henrie]

The condition "if (q->nr <= j)" checks whether the loop exited normally
or via a break statement. This check can be avoided by replacing the
jump to the end of the loop with a jump to the end of the function.

With the break replaced by a goto, the two diff_q calls then can be
replaced with a single diff_q call outside of the outer if statement.

Reviewed-by: Derrick Stolee <sto...@gmail.com>
Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 diffcore-break.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/diffcore-break.c b/diffcore-break.c
index 875aefd3fe..f6ab74141b 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -286,18 +286,17 @@ void diffcore_merge_broken(void)
                                        /* Peer survived.  Merge them */
                                        merge_broken(p, pp, &outq);
                                        q->queue[j] = NULL;
-                                       break;
+                                       goto done;
                                }
                        }
-                       if (q->nr <= j)
-                               /* The peer did not survive, so we keep
-                                * it in the output.
-                                */
-                               diff_q(&outq, p);
+                       /* The peer did not survive, so we keep
+                        * it in the output.
+                        */
                }
-               else
-                       diff_q(&outq, p);
+               diff_q(&outq, p);
        }
+
+done:
        free(q->queue);
        *q = outq;
 
-- 
2.23.0