From: Francois Gouget <fgouget@codeweavers.com>
Subject: [PATCH] testbot/web: Detect and highlight some more Git errors.
Message-Id: <E1fVyeD-0008Vx-08@amboise>
Date: Thu, 21 Jun 2018 14:25:08 +0200 (CEST)

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
---
 testbot/web/JobDetails.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl
index 8cc354e84..410d18691 100644
--- a/testbot/web/JobDetails.pl
+++ b/testbot/web/JobDetails.pl
@@ -253,9 +253,12 @@ sub GetHtmlLine($$$)
       $Line =~ / done \(258\)/ or
       $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or
       $Line =~ /^Unhandled exception: / or
+      # Git errors
+      $Line =~ /^CONFLICT / or
+      $Line =~ /^error: patch failed:/ or
+      $Line =~ /^error: corrupt patch / or
       # Build errors
       $Line =~ /: error: / or
-      $Line =~ /^error: patch failed:/ or
       $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or
       $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or
       # Typical perl errors

-- 
2.17.1