diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2012-01-27 09:52:06 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-01-31 11:43:38 +0100 |
| commit | d3f889df7d59ac3f7f7676c569a9828d56e66fe5 (patch) | |
| tree | a8cdbf34dc60c9c36bc1e60f9886f02beceb24e6 /src/plugins/git/gitsettings.cpp | |
| parent | e2ace515e2f3c9c8508e7922dabc1fffdfe57402 (diff) | |
Git: Prepend to PATH instead of replacing it
Change-Id: Ia6d783e97d7f4c80a3838b0167dcdcfce5fe4a6e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/git/gitsettings.cpp')
| -rw-r--r-- | src/plugins/git/gitsettings.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index eae064097c9..31f289eb41a 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -39,7 +39,6 @@ namespace Git { namespace Internal { -const QLatin1String GitSettings::adoptPathKey("SysEnv"); const QLatin1String GitSettings::pathKey("Path"); const QLatin1String GitSettings::pullRebaseKey("PullRebase"); const QLatin1String GitSettings::omitAnnotationDateKey("OmitAnnotationDate"); @@ -61,7 +60,6 @@ GitSettings::GitSettings() #else declareKey(timeoutKey, 30); #endif - declareKey(adoptPathKey, false); declareKey(pathKey, QString()); declareKey(pullRebaseKey, false); declareKey(omitAnnotationDateKey, false); @@ -87,7 +85,7 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const const QString binary = stringValue(binaryPathKey); QString currentPath = stringValue(pathKey); // Easy, git is assumed to be elsewhere accessible - if (!boolValue(adoptPathKey)) + if (currentPath.isEmpty()) currentPath = QString::fromLocal8Bit(qgetenv("PATH")); // Search in path? m_binaryPath = Utils::SynchronousProcess::locateBinary(currentPath, binary); |