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

Seldaek · web-flow · commit ee28354ca8d3 · 2024-06-10T14:56:42.000+02:00
diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php
@@ -294,9 +294,9 @@ public function getUnpushedChanges(PackageInterface $package, string $path): ?st
                     $unpushedChanges = null;
                 }
                 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)) {
-                        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);

Original file line number	Diff line number	Diff line change
`@@ -294,9 +294,9 @@ public function getUnpushedChanges(PackageInterface $package, string $path): ?st`
`294`	`294`	`$unpushedChanges = null;`
`295`	`295`	`}`
`296`	`296`	`foreach ($remoteBranches as $remoteBranch) {`
`297`		`- $command = sprintf('git diff --name-status %s...%s --', $remoteBranch, $branch);`
	`297`	`+ $command = ['git', 'diff', '--name-status', $remoteBranch.'...'.$branch, '--'];`
`298`	`298`	`if (0 !== $this->process->execute($command, $output, $path)) {`
`299`		`- throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());`
	`299`	`+ throw new \RuntimeException('Failed to execute ' . implode(' ', $command) . "\n\n" . $this->process->getErrorOutput());`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`$output = trim($output);`