diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-10-18 16:51:36 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-10-18 16:51:36 +0200 |
| commit | 3bdb1a3edff718caf14ed0783b0868e75c10ae0f (patch) | |
| tree | 98dcd4fc87e1687caf46758753cde69679ca09d7 /src/plugins/git | |
| parent | ac3a7991ff619f5747a6253985bdee263bb57826 (diff) | |
| parent | 471b03680329f639927f642cef07f964014fcd24 (diff) | |
Merge remote-tracking branch 'origin/9.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/vcsbase/vcscommand.cpp
Change-Id: I2d33113bfb2ea7134550cda1de4e2c21e6711778
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 50ba504781..d3ffbac050 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)); }); } }; @@ -1353,9 +1354,10 @@ VcsBaseEditorWidget *GitClient::annotate( editor->setWorkingDirectory(workingDir); QStringList arguments = {"blame", "--root"}; - arguments << argWidget->arguments() << "--" << file; + arguments << argWidget->arguments(); if (!revision.isEmpty()) arguments << revision; + arguments << "--" << file; editor->setDefaultLineNumber(lineNumber); vcsExec(workingDir, arguments, editor); return editor; |