Commit d63e38b0 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger
Browse files

Git: Fix breakage in parent commit lookup

Broken by fe1f7e4b



Change-Id: I8212b306d52ee96320a0b14f6f616b48aa928703
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 9dce1fe4
......@@ -1120,7 +1120,7 @@ bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QSt
QByteArray errorText;
QStringList args(QLatin1String("rev-list"));
args += arguments;
args << QLatin1String(noColorOption) << arguments;
const bool rc = fullySynchronousGit(workingDirectory, args, &outputTextData, &errorText);
if (!rc) {
......@@ -1151,8 +1151,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory,
*parents = QStringList(QLatin1String("HEAD"));
return true;
}
arguments << QLatin1String("rev-list") << QLatin1String(GitClient::noColorOption)
<< QLatin1String("--parents") << QLatin1String("--max-count=1") << revision;
arguments << QLatin1String("--parents") << QLatin1String("--max-count=1") << revision;
if (!files.isEmpty()) {
arguments.append(QLatin1String("--"));
arguments.append(files);
......
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