Browse Source

Backport #6312 to 1.4

Jordi Boggiano 8 years ago
parent
commit
58bbcf7d92
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/Composer/Package/Version/VersionGuesser.php

+ 1 - 1
src/Composer/Package/Version/VersionGuesser.php

@@ -98,7 +98,7 @@ class VersionGuesser
 
 
             // find current branch and collect all branch names
             // find current branch and collect all branch names
             foreach ($this->process->splitLines($output) as $branch) {
             foreach ($this->process->splitLines($output) as $branch) {
-                if ($branch && preg_match('{^(?:\* ) *(\(no branch\)|\(detached from \S+\)|\(HEAD detached at FETCH_HEAD\)|\S+) *([a-f0-9]+) .*$}', $branch, $match)) {
+                if ($branch && preg_match('{^(?:\* ) *(\(no branch\)|\(detached from \S+\)|\(HEAD detached at \S+\)|\S+) *([a-f0-9]+) .*$}', $branch, $match)) {
                     if ($match[1] === '(no branch)' || substr($match[1], 0, 10) === '(detached ' || substr($match[1], 0, 17) === '(HEAD detached at') {
                     if ($match[1] === '(no branch)' || substr($match[1], 0, 10) === '(detached ' || substr($match[1], 0, 17) === '(HEAD detached at') {
                         $version = 'dev-' . $match[2];
                         $version = 'dev-' . $match[2];
                         $prettyVersion = $version;
                         $prettyVersion = $version;