From 57c3359bdb1643db3b5e59d81e87bb90f93b6f10 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 31 May 2012 15:57:49 +0200 Subject: [PATCH] Small fixes to the version guessing --- src/Composer/Package/Loader/RootPackageLoader.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index 17b5bd1b6..725cfefda 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -162,7 +162,7 @@ class RootPackageLoader extends ArrayLoader foreach ($this->process->splitLines($output) as $branch) { if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) { if ($match[1] === '(no branch)') { - $version = $match[2]; + $version = 'dev-'.$match[2]; $isFeatureBranch = true; } else { $version = $this->versionParser->normalizeBranch($match[1]); @@ -202,6 +202,9 @@ class RootPackageLoader extends ArrayLoader if (strlen($output) < $length) { $length = strlen($output); $version = $this->versionParser->normalizeBranch($candidate); + if ('9999999-dev' === $version) { + $version = 'dev-'.$match[1]; + } } } }