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

Git: Use default encoding for git-branch output

Browse Source 
I see no reason why that should require source encoding.

Change-Id: Idd7103f09fd66f0363f8e58e04a8abdb183f74ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-04-14 14:44:35 +02:00
parent b6608d0d37
commit 9364f64f2a
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,13 +562,6 @@ static inline QString msgCannotLaunch(const QString &binary)
return GitClient::tr("Cannot launch \"%1\".").arg(QDir::toNativeSeparators(binary)); return GitClient::tr("Cannot launch \"%1\".").arg(QDir::toNativeSeparators(binary));
} }
static inline QString currentDocumentPath()
{
if (IDocument *document= EditorManager::currentDocument())
return document->filePath().toFileInfo().path();
return QString();
}
static inline void msgCannotRun(const QString &message, QString *errorMessage) static inline void msgCannotRun(const QString &message, QString *errorMessage)
{ {
if (errorMessage) if (errorMessage)
@@ -1490,7 +1483,6 @@ void GitClient::branchesForCommit(const QString &revision)
auto controller = qobject_cast<DiffEditorController *>(sender()); auto controller = qobject_cast<DiffEditorController *>(sender());
QString workingDirectory = controller->baseDirectory(); QString workingDirectory = controller->baseDirectory();
auto command = new VcsCommand(vcsBinary(), workingDirectory, processEnvironment()); auto command = new VcsCommand(vcsBinary(), workingDirectory, processEnvironment());
command->setCodec(codecFor(CodecSource, currentDocumentPath()));
command->setCookie(workingDirectory); command->setCookie(workingDirectory);
connect(command, &VcsCommand::output, controller, connect(command, &VcsCommand::output, controller,