From 6c9bc2824e70755d5c4d7fbde0bf0a12a35cf10f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 31 Mar 2013 12:35:42 +0200 Subject: [PATCH] Fix handling of branches with slashes, fixes #1748 --- src/Composer/Package/Loader/RootPackageLoader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index 627e40ba5..22b443e8d 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -183,7 +183,7 @@ class RootPackageLoader extends ArrayLoader // 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 ($branch && preg_match('{^(?:\* ) *(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) { if ($match[1] === '(no branch)') { $version = 'dev-'.$match[2]; $isFeatureBranch = true; @@ -197,7 +197,7 @@ class RootPackageLoader extends ArrayLoader } if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) { - if (preg_match('{^(?:\* )? *(?:[^/ ]+?/)?(\S+) *([a-f0-9]+) .*$}', $branch, $match)) { + if (preg_match('{^(?:\* )? *(\S+) *([a-f0-9]+) .*$}', $branch, $match)) { $branches[] = $match[1]; } }