public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #1382 from xrstf/hg-inactive-branches 

fixed detection of inactive branches in hg
pull/1383/merge
Jordi Boggiano 2012-12-03 04:06:03 -08:00
parent dfb5516af6 cebd43e735
commit 23844bd6e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Repository/Vcs/HgDriver.php
View File

@ -169,7 +169,7 @@ class HgDriver extends VcsDriver
$this->process->execute('hg branches', $output, $this->repoDir); $this->process->execute('hg branches', $output, $this->repoDir);
foreach ($this->process->splitLines($output) as $branch) { foreach ($this->process->splitLines($output) as $branch) {
if ($branch && preg_match('(^([^\s]+)\s+\d+:(.*)$)', $branch, $match)) { if ($branch && preg_match('(^([^\s]+)\s+\d+:([a-f0-9]+))', $branch, $match)) {
$branches[$match[1]] = $match[2]; $branches[$match[1]] = $match[2];
} }
} }