public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

VersionGuesser: local branches still need to be considered

pull/9270/head
Nils Adermann 2020-10-07 15:10:20 +02:00
parent db2f09a361
commit b3c465d55a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Version/VersionGuesser.php
View File

@ -142,7 +142,7 @@ class VersionGuesser
}
if ($branch && !preg_match('{^ *.+/HEAD }', $branch)) {
if (preg_match('{^(?:\* )? *((?:remotes/(?:origin|upstream)/)[^\s/]+) *([a-f0-9]+) .*$}', $branch, $match)) {
if (preg_match('{^(?:\* )? *((?:remotes/(?:origin|upstream)/)?[^\s/]+) *([a-f0-9]+) .*$}', $branch, $match)) {
$branches[] = $match[1];
}
}