diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-10-13 22:40:27 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2022-10-14 11:21:17 +0000 |
| commit | 967e8cf26067d1a41c11e69d0878d1e2b3474b77 (patch) | |
| tree | ed4506f013bc365d6d76aca22d579bb82d752aee /src/plugins/git | |
| parent | 359ad56e176ef59d7f72a51b24ab80df3f178497 (diff) | |
Git: Respect text encoding in project settings on diff
Fixes: QTCREATORBUG-21794
Change-Id: Ib4be9811c0ab1cba5cad4adbfe740a6d99f420d1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 50ba504781..5996d7f494 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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)); }); } }; |