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

Git: Fix breakage in parent commit lookup

Browse Source 
Broken by fe1f7e4bf6

Change-Id: I8212b306d52ee96320a0b14f6f616b48aa928703
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-07 09:23:01 +03:00
committed by Tobias Hunger
parent 9dce1fe429
commit d63e38b021
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1120,7 +1120,7 @@ bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QSt
QByteArray errorText; QByteArray errorText;
QStringList args(QLatin1String("rev-list")); QStringList args(QLatin1String("rev-list"));
args += arguments; args << QLatin1String(noColorOption) << arguments;
const bool rc = fullySynchronousGit(workingDirectory, args, &outputTextData, &errorText); const bool rc = fullySynchronousGit(workingDirectory, args, &outputTextData, &errorText);
if (!rc) { if (!rc) {
@@ -1151,8 +1151,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory,
*parents = QStringList(QLatin1String("HEAD")); *parents = QStringList(QLatin1String("HEAD"));
return true; return true;
} }
arguments << QLatin1String("rev-list") << QLatin1String(GitClient::noColorOption) arguments << QLatin1String("--parents") << QLatin1String("--max-count=1") << revision;
<< QLatin1String("--parents") << QLatin1String("--max-count=1") << revision;
if (!files.isEmpty()) { if (!files.isEmpty()) {
arguments.append(QLatin1String("--")); arguments.append(QLatin1String("--"));
arguments.append(files); arguments.append(files);