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

Git: Require 1.8.0

Browse Source 
Remove some workarounds for older versions

Git version in debian stable is 2.1.4, and in Ubuntu 14.04LTS is 1.9.1.

Change-Id: I8d558857a429149222b817401b98e90df10447b6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-09 12:08:22 +02:00
committed by Orgad Shaneh
parent 4a5213926b
commit b5987a6d49
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gitclient.cpp
View File

@@ -2838,11 +2838,8 @@ bool GitClient::synchronousSetTrackingBranch(const QString &workingDirectory,
{
QByteArray outputText;
QStringList arguments;
arguments << QLatin1String("branch");
if (gitVersion() >= 0x010800)
arguments << (QLatin1String("--set-upstream-to=") + tracking) << branch;
else
arguments << QLatin1String("--set-upstream") << branch << tracking;
arguments << QLatin1String("branch")
<< (QLatin1String("--set-upstream-to=") + tracking) << branch;
return vcsFullySynchronousExec(workingDirectory, arguments, &outputText);
}