From 61a3c50436bcbf7158fd4fab9976b3100fc935b6 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 14 Oct 2012 13:42:14 +0200 Subject: [PATCH] Fix version guessing when used on feature branches --- src/Composer/Package/Loader/RootPackageLoader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index 2733744ee..8383f8b76 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -165,6 +165,7 @@ class RootPackageLoader extends ArrayLoader $isFeatureBranch = false; $version = null; + // find current branch and collect all branch names foreach ($this->process->splitLines($output) as $branch) { if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) { if ($match[1] === '(no branch)') { @@ -199,7 +200,7 @@ class RootPackageLoader extends ArrayLoader $length = PHP_INT_MAX; foreach ($branches as $candidate) { // 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; } if (0 !== $this->process->execute('git rev-list '.$candidate.'..'.$branch, $output)) {