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

Git: Respect text encoding in project settings on diff

Browse Source 
Fixes: QTCREATORBUG-21794
Change-Id: Ib4be9811c0ab1cba5cad4adbfe740a6d99f420d1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Orgad Shaneh
2022-10-13 22:40:27 +03:00
committed by Orgad Shaneh
parent 359ad56e17
commit 967e8cf260
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,7 +278,8 @@ public:
: GitBaseDiffEditorController(document, leftCommit, rightCommit)
{
setReloader([this, extraArgs] {
runCommand({addConfigurationArguments(baseArguments() << extraArgs)});
runCommand({addConfigurationArguments(baseArguments() << extraArgs)},
VcsBaseEditor::getCodec(workingDirectory(), {}));
});
}
};
@@ -413,7 +414,7 @@ public:
argLists << addConfigurationArguments(baseArguments() << "--" << unstagedFiles);
if (!argLists.isEmpty())
runCommand(argLists);
runCommand(argLists, VcsBaseEditor::getCodec(workingDirectory(), stagedFiles + unstagedFiles));
});
}
};