diff options
| author | Yuchen Deng <loaden@gmail.com> | 2011-11-14 15:45:11 +0800 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-11-14 10:25:43 +0100 |
| commit | 73138f633fd384ae3adae58976109de776dc1156 (patch) | |
| tree | 6e66bb5f452bd480404ad7a97e8f4db31a0be977 | |
| parent | 8382dd7a03418944f94d719b047f7593f9391e97 (diff) | |
| download | qt-creator-73138f633fd384ae3adae58976109de776dc1156.tar.gz | |
Git: Figure out codec for amend commit
Change-Id: Ib8fddbb8343f92cf74b99117999ec033b1785404
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 16943d6c8b..e81f27e62e 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1641,11 +1641,12 @@ bool GitClient::getCommitData(const QString &workingDirectory, // Get the commit template or the last commit message if (amend) { - // Amend: get last commit data as "SHA1@message". TODO: Figure out codec. + // Amend: get last commit data as "SHA1@message". QStringList args(QLatin1String("log")); const QString format = synchronousGitVersion(true) > 0x010701 ? "%h@%B" : "%h@%s%n%n%b"; args << QLatin1String("--max-count=1") << QLatin1String("--pretty=format:") + format; - const Utils::SynchronousProcessResponse sp = synchronousGit(repoDirectory, args); + QTextCodec *codec = QTextCodec::codecForName(commitData->commitEncoding.toLocal8Bit()); + const Utils::SynchronousProcessResponse sp = synchronousGit(repoDirectory, args, 0, codec); if (sp.result != Utils::SynchronousProcessResponse::Finished) { *errorMessage = tr("Cannot retrieve last commit data of repository \"%1\".").arg(repoDirectory); return false; diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 2f308e6eb7..58b05c8571 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -673,7 +673,6 @@ void GitPlugin::startCommit() void GitPlugin::startCommit(bool amend) { - if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor()) return; if (isCommitEditorOpen()) { |