Merge remote-tracking branch 'origin/4.12'

Change-Id: Ic741fdedc168430e5be6cb1645d9329dbc7a6b08
2020-03-23 09:35:54 +01:00
parent 80a766a2cb e3581a3961
commit ee2840d5b8
28 changed files with 360 additions and 186 deletions
--- a/src/plugins/vcsbase/vcsoutputformatter.cpp
+++ b/src/plugins/vcsbase/vcsoutputformatter.cpp
@@ -38,7 +38,8 @@ 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
+        "|\\^+|~\\d+)?)")                             // or 789acf^ or 123abc~99
 {
 }