|
@@ -194,8 +194,8 @@ 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 ($match[1] === '(no branch)') {
|
|
|
+ if ($branch && preg_match('{^(?:\* ) *(\(no branch\)|\(detached from [a-f0-9]+\)|\S+) *([a-f0-9]+) .*$}', $branch, $match)) {
|
|
|
+ if ($match[1] === '(no branch)' || substr($match[1], 0, 10) === '(detached ') {
|
|
|
$version = 'dev-'.$match[2];
|
|
|
$isFeatureBranch = true;
|
|
|
} else {
|