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

Git: Avoid passing strings to resolve text encodings

Browse Source 
Therefore, merge the code of codecFor() and encoding()
to avoid further mis-usage.

Change-Id: I086e4ace6c791d16f43f14c423b6529ad199c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2023-01-30 13:52:30 +01:00
committed by André Hartmann
parent 7cd4c295c7
commit 86ffc29239
4 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitplugin.cpp
View File

@@ -1581,7 +1581,7 @@ void GitPluginPrivate::instantBlame()
const CommitInfo info = parseBlameOutput(output.split('\n'), filePath, m_author);
m_blameMark.reset(new BlameMark(filePath, line, info));
};
QTextCodec *codec = GitClient::instance()->encoding(workingDirectory, "i18n.commitEncoding");
QTextCodec *codec = GitClient::instance()->encoding(GitClient::EncodingCommit, workingDirectory);
GitClient::instance()->vcsExecWithHandler(workingDirectory,
{"blame", "-p", "-L", lineString, "--", filePath.toString()},
this, commandHandler, RunFlags::NoOutput, codec);