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

Git: Use commit encoding for git show.

Browse Source 
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>
This commit is contained in:
Andre Hartmann
2014-03-17 20:06:52 +01:00
committed by Orgad Shaneh
parent aec12ca069
commit ae09c33fdf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,7 +424,8 @@ void GitDiffHandler::collectShowDescription(const QString &id)
m_editorController->clear(m_waitMessage); m_editorController->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(m_gitPath, m_workingDirectory, m_processEnvironment); 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))); connect(command, SIGNAL(output(QString)), this, SLOT(slotShowDescriptionReceived(QString)));
QStringList arguments; QStringList arguments;
arguments << QLatin1String("show") << QLatin1String("-s") arguments << QLatin1String("show") << QLatin1String("-s")