Merge remote-tracking branch 'origin/3.5'

Change-Id: I4d74ad26046136ff2d38cfc1015b502009b2b344

1 files changed, 29 insertions, 25 deletions

diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index cc58e6ff07a..6bd665c9ed8 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -119,31 +119,35 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
 MergeTool::FileState MergeTool::waitAndReadStatus(QString &extraInfo)
 {
     QByteArray state;
-    if (m_process->canReadLine() || (m_process->waitForReadyRead(500) && m_process->canReadLine())) {
-        state = m_process->readLine().trimmed();
-        // "  {local}: modified file"
-        // "  {remote}: deleted"
-        if (!state.isEmpty()) {
-            state = state.mid(state.indexOf(':') + 2);
-            if (state == "deleted")
-                return DeletedState;
-            if (state.startsWith("modified"))
-                return ModifiedState;
-            if (state.startsWith("created"))
-                return CreatedState;
-            QByteArray submodulePrefix("submodule commit ");
-            // "  {local}: submodule commit <hash>"
-            if (state.startsWith(submodulePrefix)) {
-                extraInfo = QString::fromLocal8Bit(state.mid(submodulePrefix.size()));
-                return SubmoduleState;
-            }
-            // "  {local}: a symbolic link -> 'foo.cpp'"
-            QByteArray symlinkPrefix("a symbolic link -> '");
-            if (state.startsWith(symlinkPrefix)) {
-                extraInfo = QString::fromLocal8Bit(state.mid(symlinkPrefix.size()));
-                extraInfo.chop(1); // remove last quote
-                return SymbolicLinkState;
-            }
+    for (int i = 0; i < 5; ++i) {
+        if (m_process->canReadLine()) {
+            state = m_process->readLine().trimmed();
+            break;
+        }
+        m_process->waitForReadyRead(500);
+    }
+    // "  {local}: modified file"
+    // "  {remote}: deleted"
+    if (!state.isEmpty()) {
+        state = state.mid(state.indexOf(':') + 2);
+        if (state == "deleted")
+            return DeletedState;
+        if (state.startsWith("modified"))
+            return ModifiedState;
+        if (state.startsWith("created"))
+            return CreatedState;
+        QByteArray submodulePrefix("submodule commit ");
+        // "  {local}: submodule commit <hash>"
+        if (state.startsWith(submodulePrefix)) {
+            extraInfo = QString::fromLocal8Bit(state.mid(submodulePrefix.size()));
+            return SubmoduleState;
+        }
+        // "  {local}: a symbolic link -> 'foo.cpp'"
+        QByteArray symlinkPrefix("a symbolic link -> '");
+        if (state.startsWith(symlinkPrefix)) {
+            extraInfo = QString::fromLocal8Bit(state.mid(symlinkPrefix.size()));
+            extraInfo.chop(1); // remove last quote
+            return SymbolicLinkState;
         }
     }
     return UnknownState;