From fa9008c7f83c1351f9282b512de42ea25a9d53d4 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 9 Sep 2022 13:18:05 +0200
Subject: [PATCH] VcsOutputWindow: Don't append \n when line ends with \r

Amends a2797ec80e8024fb40b314f6ed9f280c19fbc0a6

Fixes: QTCREATORBUG-27615
Change-Id: I5b2d2bc442696a1560a2af3dfe14e70a9c42cc88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/vcsbase/vcsoutputwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index 976bf82c428..ed6c8a6ed35 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -428,7 +428,7 @@ void VcsOutputWindow::append(const QString &text, MessageStyle style, bool silen
 
 void VcsOutputWindow::appendError(const QString &text)
 {
-    append(text.endsWith('\n') ? text : text + '\n', Error, false);
+    append((text.endsWith('\n') || text.endsWith('\r')) ? text : text + '\n', Error, false);
 }
 
 void VcsOutputWindow::appendWarning(const QString &text)