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

Add missing v before checkout branches when needed, refs #1164

pull/1191/merge
Jordi Boggiano 2012-10-19 11:43:49 +02:00
parent 43c21a736c
commit a28d53d4c0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,10 +164,15 @@ class GitDownloader extends VcsDownloader
$template = 'git checkout %s && git reset --hard %1$s'; $template = 'git checkout %s && git reset --hard %1$s';
$branch = preg_replace('{(?:^dev-|(?:\.x)?-dev$)}i', '', $branch); $branch = preg_replace('{(?:^dev-|(?:\.x)?-dev$)}i', '', $branch);
$branches = null;
if (0 === $this->process->execute('git branch -r', $output, $path)) {
$branches = $output;
}
// check whether non-commitish are branches or tags, and fetch branches with the remote name // check whether non-commitish are branches or tags, and fetch branches with the remote name
$gitRef = $reference; $gitRef = $reference;
if (!preg_match('{^[a-f0-9]{40}$}', $reference) if (!preg_match('{^[a-f0-9]{40}$}', $reference)
&& 0 === $this->process->execute('git branch -r', $output, $path) && $branches
&& preg_match('{^\s+composer/'.preg_quote($reference).'$}m', $output) && preg_match('{^\s+composer/'.preg_quote($reference).'$}m', $output)
) { ) {
$command = sprintf('git checkout -B %s %s && git reset --hard %2$s', escapeshellarg($branch), escapeshellarg('composer/'.$reference)); $command = sprintf('git checkout -B %s %s && git reset --hard %2$s', escapeshellarg($branch), escapeshellarg('composer/'.$reference));
@ -178,6 +183,11 @@ class GitDownloader extends VcsDownloader
// try to checkout branch by name and then reset it so it's on the proper branch name // try to checkout branch by name and then reset it so it's on the proper branch name
if (preg_match('{^[a-f0-9]{40}$}', $reference)) { if (preg_match('{^[a-f0-9]{40}$}', $reference)) {
// add 'v' in front of the branch if it was stripped when generating the pretty name
if (!preg_match('{^\s+composer/'.preg_quote($branch).'$}m', $branches) && preg_match('{^\s+composer/v'.preg_quote($branch).'$}m', $branches)) {
$branch = 'v' . $branch;
}
$command = sprintf('git checkout %s', escapeshellarg($branch)); $command = sprintf('git checkout %s', escapeshellarg($branch));
$fallbackCommand = sprintf('git checkout -B %s %s', escapeshellarg($branch), escapeshellarg('composer/'.$branch)); $fallbackCommand = sprintf('git checkout -B %s %s', escapeshellarg($branch), escapeshellarg('composer/'.$branch));
if (0 === $this->process->execute($command, $output, $path) if (0 === $this->process->execute($command, $output, $path)