diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2020-04-05 21:27:28 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2020-04-06 10:28:09 +0000 |
| commit | 93e788fd196bf90ea10ff8621ae6233f26d44e0e (patch) | |
| tree | 7d941638095f52aacf6fdc408781412be8ad0a7a /src/plugins/vcsbase | |
| parent | 45695598980b1768f9a033ba955ac9bf4bfb876d (diff) | |
VcsOutputFormatter: Allow ranges with three dots also
This can, for example happen after a forced push to Gitlab.
The VCS output looks like this in that case:
+ 7c145ae...c301cc6 master -> master (forced update)
Change-Id: I84bec1a6cf2bf875732461f767ebbf4703cdbadb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsoutputformatter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsoutputformatter.cpp b/src/plugins/vcsbase/vcsoutputformatter.cpp index 1ee56f6167..07d7c19375 100644 --- 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,}(?:\\.{2,3}[0-9a-f]{6,}" // 789acf or 123abc..456cde "|\\^+|~\\d+)?)") // or 789acf^ or 123abc~99 { } |