diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-04-07 09:23:01 +0300 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-04-08 10:43:28 +0200 |
commit | d63e38b0212b6331b60ceae27bc05f75f562a921 (patch) | |
tree | ef331d39357d704ea69a0cdeae879270154c551d | |
parent | 9dce1fe429e42030a5b07bfbb4fbc8a198bdbb56 (diff) | |
download | qt-creator-d63e38b0212b6331b60ceae27bc05f75f562a921.tar.gz |
Git: Fix breakage in parent commit lookup
Broken by fe1f7e4bf64f783f5c66cb5da2e2f2112e50d92c
Change-Id: I8212b306d52ee96320a0b14f6f616b48aa928703
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r-- | src/plugins/git/gitclient.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index acc6c5e10f..1d2020e393 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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); |