merge(3p/git): Merge git upstream at v2.26.2 r/808

1 files changed, 6 insertions, 6 deletions

diff --git a/third_party/git/diffcore-break.c b/third_party/git/diffcore-break.c
index 875aefd3febf..9d20a6a6fc1d 100644
--- a/third_party/git/diffcore-break.c
+++ b/third_party/git/diffcore-break.c
@@ -286,17 +286,17 @@ void diffcore_merge_broken(void)
 					/* Peer survived.  Merge them */
 					merge_broken(p, pp, &outq);
 					q->queue[j] = NULL;
-					break;
+					goto next;
 				}
 			}
-			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.
+			 */
+			diff_q(&outq, p);
 		}
 		else
 			diff_q(&outq, p);
+next:;
 	}
 	free(q->queue);
 	*q = outq;