Bladeren bron

Fix handling of branches with slashes, fixes #1748

Jordi Boggiano 12 jaren geleden
bovenliggende
commit
6c9bc2824e
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 2 2
      src/Composer/Package/Loader/RootPackageLoader.php

+ 2 - 2
src/Composer/Package/Loader/RootPackageLoader.php

@@ -183,7 +183,7 @@ class RootPackageLoader extends ArrayLoader
 
 
             // find current branch and collect all branch names
             // 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)') {
                         $version = 'dev-'.$match[2];
                         $version = 'dev-'.$match[2];
                         $isFeatureBranch = true;
                         $isFeatureBranch = true;
@@ -197,7 +197,7 @@ class RootPackageLoader extends ArrayLoader
                 }
                 }
 
 
                 if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) {
                 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];
                         $branches[] = $match[1];
                     }
                     }
                 }
                 }