aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2022-09-19 08:57:24 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2022-09-19 10:31:45 +0000
commiteda8a4244f2b291916eeea774a2f16147ddefbaa (patch)
treebe5890accdc9224b09917a3630017425d89a05ae /src/plugins/git
parent3978cdde6c9c3dc38e67d87cfe58916d6b4095de (diff)
GitBaseDiffEditorController: Use cleanedStdOut()
Instead of connecting to stdOutText() signal. Change-Id: Ia9d1d38934e254a8824620947a409fc52f7f531f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git')
-rw-r--r--src/plugins/git/gitclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 252568b382..fac03a8efa 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -320,7 +320,7 @@ void GitBaseDiffEditorController::updateBranchList()
VcsCommand *command = m_instance->vcsExec(baseDirectory(),
{"branch", noColorOption, "-a", "--contains", revision});
- connect(command, &VcsCommand::stdOutText, this, [this](const QString &text) {
+ connect(command, &VcsCommand::finished, this, [this, command] {
const QString remotePrefix = "remotes/";
const QString localPrefix = "<Local>";
const int prefixLength = remotePrefix.length();
@@ -328,7 +328,7 @@ void GitBaseDiffEditorController::updateBranchList()
QStringList branches;
QString previousRemote = localPrefix;
bool first = true;
- for (const QString &branch : text.split('\n')) {
+ for (const QString &branch : command->cleanedStdOut().split('\n')) {
const QString b = branch.mid(2).trimmed();
if (b.isEmpty())
continue;