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

Clean Git repos during discard

pull/8993/head
Michael Stucki 2020-06-15 21:42:41 +02:00 committed by Jordi Boggiano
parent fb7fc4a4ca
commit 0278e7453d
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,7 +451,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
protected function discardChanges($path) protected function discardChanges($path)
{ {
$path = $this->normalizePath($path); $path = $this->normalizePath($path);
if (0 !== $this->process->execute('git reset --hard', $output, $path)) { if (0 !== $this->process->execute('git clean -df && git reset --hard', $output, $path)) {
throw new \RuntimeException("Could not reset changes\n\n:".$this->process->getErrorOutput()); throw new \RuntimeException("Could not reset changes\n\n:".$this->process->getErrorOutput());
} }