From 3da6ca098c66be93067bae560706b35b142295ef Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 7 Apr 2009 12:04:43 +0200
Subject: [PATCH] Kill the git process if we timed out waiting for it.
---
src/plugins/git/gitclient.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index c7558f1a18f..d563b95d8fe 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -544,9 +544,11 @@ bool GitClient::synchronousGit(const QString &workingDirectory,
process.setEnvironment(environment.toStringList());
process.start(m_binaryPath, arguments);
+
if (!process.waitForFinished()) {
if (errorText)
*errorText = "Error: Git timed out";
+ process.kill();
return false;
}
--
GitLab