feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Fix parsing in mergetool

Browse Source 
Amends commit 50586c7bb8.

Fixes: QTCREATORBUG-26994
Change-Id: I799d05590b3433ec165d9d7f9143bea7d66b9711
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Orgad Shaneh
2022-02-06 08:31:00 +02:00
committed by Orgad Shaneh
parent ac7ed5bebe
commit 6612fd16a7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/mergetool.cpp
View File

@@ -211,7 +211,10 @@ void MergeTool::readData()
VcsOutputWindow::append(newData); VcsOutputWindow::append(newData);
QString data = m_unfinishedLine + newData; QString data = m_unfinishedLine + newData;
m_unfinishedLine.clear(); 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); const QString line = data.left(index + 1);
readLine(line); readLine(line);
data = data.mid(index + 1); data = data.mid(index + 1);