From 6612fd16a7bdbf64a0fd47cf19ddd4dd3153d4ef Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 6 Feb 2022 08:31:00 +0200
Subject: [PATCH] Git: Fix parsing in mergetool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Amends commit 50586c7bb8806eccbe3b8b2684e7083e5633d58f.

Fixes: QTCREATORBUG-26994
Change-Id: I799d05590b3433ec165d9d7f9143bea7d66b9711
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/git/mergetool.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index c84273f438a..b1da451b6b0 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -211,7 +211,10 @@ void MergeTool::readData()
     VcsOutputWindow::append(newData);
     QString data = m_unfinishedLine + newData;
     m_unfinishedLine.clear();
-    while (const int index = data.indexOf('\n') != -1) {
+    for (;;) {
+        const int index = data.indexOf('\n');
+        if (index == -1)
+            break;
         const QString line = data.left(index + 1);
         readLine(line);
         data = data.mid(index + 1);