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

Make the git plugin look for the binary in the path specified in the settings. Previously, the environment was passed to the process, but that did not affect the location of the binary.

Browse Source
This commit is contained in:
Friedemann Kleint
2009-02-19 17:47:44 +01:00
committed by unknown
parent 890220d5b4
commit 90b094e832
9 changed files with 173 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gitcommand.cpp
View File

@@ -61,8 +61,10 @@ GitCommand::Job::Job(const QStringList &a, int t) :
{
}
GitCommand::GitCommand(const QString &workingDirectory,
GitCommand::GitCommand(const QString &binaryPath,
const QString &workingDirectory,
ProjectExplorer::Environment &environment) :
m_binaryPath(binaryPath),
m_workingDirectory(workingDirectory),
m_environment(environmentToList(environment))
{
@@ -109,7 +111,7 @@ void GitCommand::run()
if (Git::Constants::debug)
qDebug() << "GitCommand::run" << j << '/' << count << m_jobs.at(j).arguments;
process.start(QLatin1String(Constants::GIT_BINARY), m_jobs.at(j).arguments);
process.start(m_binaryPath, m_jobs.at(j).arguments);
if (!process.waitForFinished(m_jobs.at(j).timeout * 1000)) {
ok = false;
error += QLatin1String("Error: Git timed out");