From d78ccc30cbd7194094834faeaf67bd7f3227cef8 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 19 Sep 2022 09:41:49 +0200
Subject: [PATCH] ConflictHandler: Use cleanedStdOut() and cleanedStdErr()

Instead of connecting to stdOutText() and stdErrText() signals.

Change-Id: I3a90fe2a6b17eb804dbd67691a4685e236232456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/git/gitclient.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index fac03a8efa6..bc476ed71f0 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -731,8 +731,10 @@ public:
         handler->setParent(command); // delete when command goes out of scope
 
         command->addFlags(VcsCommand::ExpectRepoChanges);
-        connect(command, &VcsCommand::stdOutText, handler, &ConflictHandler::readStdOut);
-        connect(command, &VcsCommand::stdErrText, handler, &ConflictHandler::readStdErr);
+        connect(command, &VcsCommand::finished, handler, [handler, command] {
+            handler->readStdOut(command->cleanedStdOut());
+            handler->readStdErr(command->cleanedStdErr());
+        });
     }
 
     static void handleResponse(const VcsBase::CommandResult &result,