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

Fix version guessing when used on feature branches

pull/1210/merge
Jordi Boggiano 2012-10-14 13:42:14 +02:00
parent 59edd4e6d6
commit 61a3c50436
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -165,6 +165,7 @@ class RootPackageLoader extends ArrayLoader
$isFeatureBranch = false; $isFeatureBranch = false;
$version = null; $version = null;
// 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('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) { if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) {
if ($match[1] === '(no branch)') { if ($match[1] === '(no branch)') {
@ -199,7 +200,7 @@ class RootPackageLoader extends ArrayLoader
$length = PHP_INT_MAX; $length = PHP_INT_MAX;
foreach ($branches as $candidate) { foreach ($branches as $candidate) {
// do not compare against other feature branches // do not compare against other feature branches
if ($candidate === $branch || !preg_match('{^(master|trunk|default|develop|\d+\..+)$}', $candidate)) { if ($candidate === $branch || !preg_match('{^(master|trunk|default|develop|\d+\..+)$}', $candidate, $match)) {
continue; continue;
} }
if (0 !== $this->process->execute('git rev-list '.$candidate.'..'.$branch, $output)) { if (0 !== $this->process->execute('git rev-list '.$candidate.'..'.$branch, $output)) {