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

Merge pull request #2921 from schmkr/svn-driver-patch 

Updating SvnDriver trunk revision check
pull/2931/head
Jordi Boggiano 2014-04-16 08:27:25 +02:00
parent 14f35e812c 8dd6b052ce
commit 7b487360e3
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/SvnDriver.php
View File

@ -207,7 +207,7 @@ class SvnDriver extends VcsDriver
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] === 'composer.json') { if (isset($match[1]) && isset($match[2]) && $match[2] === './') {
$this->branches['trunk'] = $this->buildIdentifier( $this->branches['trunk'] = $this->buildIdentifier(
'/' . $this->trunkPath, '/' . $this->trunkPath,
$match[1] $match[1]