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

Checkout branch by name when the current reference matches the branch tip, fixes #1164

pull/1223/merge
Jordi Boggiano 2012-10-17 10:49:54 +02:00
parent 0c3371b30f
commit 3068f29b4f
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Composer/Downloader/GitDownloader.php
View File

@ -170,6 +170,19 @@ class GitDownloader extends VcsDownloader
$gitRef = 'composer/'.$reference; $gitRef = 'composer/'.$reference;
} }
$branch = preg_replace('{(?:^dev-|(?:\.x)?-dev$)}i', '', $branch);
// checkout branch by name if the current reference matches the tip of the branch
if (preg_match('{^[a-f0-9]{40}$}', $reference)
&& 0 === $this->process->execute('git log '.escapeshellarg($branch).' -1 --format=format:%H', $output, $path)
&& $reference === trim($output)
) {
$command = sprintf('git checkout -B %s %s && git reset --hard %2$s', escapeshellarg($branch), escapeshellarg('composer/'.$branch));
if (0 === $this->process->execute($command, $output, $path)) {
return;
}
}
$command = sprintf($template, escapeshellarg($gitRef)); $command = sprintf($template, escapeshellarg($gitRef));
if (0 === $this->process->execute($command, $output, $path)) { if (0 === $this->process->execute($command, $output, $path)) {
return; return;
@ -177,7 +190,6 @@ class GitDownloader extends VcsDownloader
// reference was not found (prints "fatal: reference is not a tree: $ref") // reference was not found (prints "fatal: reference is not a tree: $ref")
if ($date && false !== strpos($this->process->getErrorOutput(), $reference)) { if ($date && false !== strpos($this->process->getErrorOutput(), $reference)) {
$branch = preg_replace('{(?:^dev-|(?:\.x)?-dev$)}i', '', $branch);
$date = $date->format('U'); $date = $date->format('U');
// guess which remote branch to look at first // guess which remote branch to look at first

5
tests/Composer/Test/Downloader/GitDownloaderTest.php
View File

@ -67,6 +67,11 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(0)); ->will($this->returnValue(0));
$processExecutor->expects($this->at(1)) $processExecutor->expects($this->at(1))
->method('execute')
->with($this->equalTo($this->getCmd("git log 'master' -1 --format=format:%H")), $this->equalTo(null), $this->equalTo('composerPath'))
->will($this->returnValue(0));
$processExecutor->expects($this->at(2))
->method('execute') ->method('execute')
->with($this->equalTo($this->getCmd("git checkout '1234567890123456789012345678901234567890' && git reset --hard '1234567890123456789012345678901234567890'")), $this->equalTo(null), $this->equalTo('composerPath')) ->with($this->equalTo($this->getCmd("git checkout '1234567890123456789012345678901234567890' && git reset --hard '1234567890123456789012345678901234567890'")), $this->equalTo(null), $this->equalTo('composerPath'))
->will($this->returnValue(0)); ->will($this->returnValue(0));