Merge branch '2.2' into 2.3

2022-07-20 22:47:36 +02:00 · 2022-07-20 22:47:36 +02:00 · e815e0113a
parent 734cbeb610 623f903d62
commit e815e0113a
1 changed files with 1 additions and 1 deletions
--- a/src/Composer/Util/Hg.php
+++ b/src/Composer/Util/Hg.php
@ -107,7 +107,7 @@ class Hg
    {
        if (false === self::$version) {
            self::$version = null;
-            if (0 === $process->execute('hg --version', $output) && Preg::isMatch('/^.+? (\d+(?:\.\d+)+)\)?\r?\n/', $output, $matches)) {
+            if (0 === $process->execute('hg --version', $output) && Preg::isMatch('/^.+? (\d+(?:\.\d+)+)(?:\+.*?)?\)?\r?\n/', $output, $matches)) {
                self::$version = $matches[1];
            }
        }