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

GitDownloader: combine checkout + reset commands into a single process 

use a single process instead of 3 to improve performance
pull/9617/head
Markus Staab 2021-01-16 22:26:20 +01:00
parent de58c5499e
commit 8dfe45a026
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,13 +454,10 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
$command = sprintf('git checkout %s --', ProcessExecutor::escape($branch));
$fallbackCommand = sprintf('git checkout '.$force.'-B %s %s --', ProcessExecutor::escape($branch), ProcessExecutor::escape('composer/'.$branch));
if (0 === $this->process->execute($command, $output, $path)
|| 0 === $this->process->execute($fallbackCommand, $output, $path)
) {
$command = sprintf('git reset --hard %s --', ProcessExecutor::escape($reference));
if (0 === $this->process->execute($command, $output, $path)) {
return null;
}
$resetCommand = sprintf('git reset --hard %s --', ProcessExecutor::escape($reference));
if (0 === $this->process->execute("($command || $fallbackCommand) && $resetCommand", $output, $path)) {
return null;
}
}