Commit 7a40a7bb authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Git: Do not require the path to be set in the config

Fix regression where creator was no longer able to run git if the
PATH was not explicitly set in the configuration.

Task-number: QTCREATORBUG-2478
Reviewed-by: Robert Loehning
parent 16f27124
......@@ -128,11 +128,12 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
if (errorMessage)
errorMessage->clear();
const QString binary = QLatin1String(Constants::GIT_BINARY);
QString currentPath = path;
// Easy, git is assumed to be elsewhere accessible
if (!adoptPath)
return binary;
currentPath = QString::fromLocal8Bit(qgetenv("PATH"));
// Search in path?
const QString pathBinary = Utils::SynchronousProcess::locateBinary(path, binary);
const QString pathBinary = Utils::SynchronousProcess::locateBinary(currentPath, binary);
if (pathBinary.isEmpty()) {
if (ok)
*ok = false;
......@@ -144,5 +145,5 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
return pathBinary;
}
}
}
} // namespace Internal
} // namespace Git
......@@ -47,6 +47,7 @@ struct GitSettings
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
/** Return the full path to the git executable */
QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
bool equals(const GitSettings &s) const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment