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

Merge pull request from GHSA-47f6-5gq3-vx9c

pull/12013/head
Jordi Boggiano 2024-06-10 14:56:42 +02:00 committed by GitHub
parent 6bd43dff85
commit ee28354ca8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,9 +294,9 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
$unpushedChanges = null; $unpushedChanges = null;
} }
foreach ($remoteBranches as $remoteBranch) { foreach ($remoteBranches as $remoteBranch) {
$command = sprintf('git diff --name-status %s...%s --', $remoteBranch, $branch); $command = ['git', 'diff', '--name-status', $remoteBranch.'...'.$branch, '--'];
if (0 !== $this->process->execute($command, $output, $path)) { if (0 !== $this->process->execute($command, $output, $path)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . implode(' ', $command) . "\n\n" . $this->process->getErrorOutput());
} }
$output = trim($output); $output = trim($output);