From ae09c33fdfa05b5f01b5b69acae49de4e518ffd0 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Mon, 17 Mar 2014 20:06:52 +0100
Subject: [PATCH] Git: Use commit encoding for git show.
At least for the Side-By-Side Diff for now.
Task-number: QTCREATORBUG-11115
Change-Id: Ic7cb91f48ca810a99c39b2d00acc0cf227d051be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitclient.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 482e4430d22..8d21e8e3756 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -424,7 +424,8 @@ void GitDiffHandler::collectShowDescription(const QString &id)
m_editorController->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(m_gitPath, m_workingDirectory, m_processEnvironment);
- command->setCodec(Core::EditorManager::defaultTextCodec());
+ const QString encoding = GitPlugin::instance()->gitClient()->commitEncoding(m_workingDirectory);
+ command->setCodec(QTextCodec::codecForName(encoding.toLocal8Bit()));
connect(command, SIGNAL(output(QString)), this, SLOT(slotShowDescriptionReceived(QString)));
QStringList arguments;
arguments << QLatin1String("show") << QLatin1String("-s")
--
GitLab