diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/diffcore-break.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/diffcore-break.c')
| -rw-r--r-- | third_party/git/diffcore-break.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/git/diffcore-break.c b/third_party/git/diffcore-break.c index 9d20a6a6fc..875aefd3fe 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; - goto next; + break; } } - /* The peer did not survive, so we keep - * it in the output. - */ - diff_q(&outq, p); + if (q->nr <= j) + /* 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; |