forked from qt-creator/qt-creator
		
	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>
This commit is contained in:
		
				
					committed by
					
						
						Orgad Shaneh
					
				
			
			
				
	
			
			
			
						parent
						
							aec12ca069
						
					
				
				
					commit
					ae09c33fdf
				
			@@ -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")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user