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

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

Browse Source 
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
This commit is contained in:
Tobias Hunger
2010-09-28 12:55:35 +02:00
parent 16f2712403
commit 7a40a7bb0e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/gitsettings.cpp
View File

@@ -128,11 +128,12 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
if (errorMessage) if (errorMessage)
errorMessage->clear(); errorMessage->clear();
const QString binary = QLatin1String(Constants::GIT_BINARY); const QString binary = QLatin1String(Constants::GIT_BINARY);
QString currentPath = path;
// Easy, git is assumed to be elsewhere accessible // Easy, git is assumed to be elsewhere accessible
if (!adoptPath) if (!adoptPath)
return binary; currentPath = QString::fromLocal8Bit(qgetenv("PATH"));
// Search in path? // Search in path?
const QString pathBinary = Utils::SynchronousProcess::locateBinary(path, binary); const QString pathBinary = Utils::SynchronousProcess::locateBinary(currentPath, binary);
if (pathBinary.isEmpty()) { if (pathBinary.isEmpty()) {
if (ok) if (ok)
*ok = false; *ok = false;
@@ -144,5 +145,5 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
return pathBinary; return pathBinary;
} }
} } // namespace Internal
} } // namespace Git

1
src/plugins/git/gitsettings.h
View File

@@ -47,6 +47,7 @@ struct GitSettings
void fromSettings(QSettings *); void fromSettings(QSettings *);
void toSettings(QSettings *) const; void toSettings(QSettings *) const;
/** Return the full path to the git executable */
QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const; QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
bool equals(const GitSettings &s) const; bool equals(const GitSettings &s) const;