Merge remote-tracking branch 'origin/4.12'

Change-Id: Ia8254720b2ba6e3e7b859017e1c2b6e289bed771
2020-03-20 08:16:19 +01:00
parent 5de0e81d8b 7f0b418a22
commit d80f3972a4
26 changed files with 174 additions and 101 deletions
--- a/src/plugins/vcsbase/vcsoutputformatter.cpp
+++ b/src/plugins/vcsbase/vcsoutputformatter.cpp
@@ -38,7 +38,7 @@ VcsOutputFormatter::VcsOutputFormatter() :
    m_regexp(
        "(https?://\\S*)"                             // https://codereview.org/c/1234
        "|(v[0-9]+\\.[0-9]+\\.[0-9]+[\\-A-Za-z0-9]*)" // v0.1.2-beta3
-        "|([0-9a-f]{6,}(?:\\.\\.[0-9a-f]{6,})?)")     // 789acf or 123abc..456cde
+        "|([0-9a-f]{6,}(?:\\.\\.[0-9a-f]{6,}|\\^)?)") // 789acf^ or 123abc..456cde
 {
 }