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

Always reset stash change, refs #1254

pull/1020/merge
Jordi Boggiano 2012-10-24 12:30:11 +02:00
parent cd284733ef
commit a7cc5f187f
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

@ -153,11 +153,11 @@ class GitDownloader extends VcsDownloader
protected function reapplyChanges($path) protected function reapplyChanges($path)
{ {
if ($this->hasStashedChanges) { if ($this->hasStashedChanges) {
$this->hasStashedChanges = false;
$this->io->write(' <info>Re-applying stashed changes'); $this->io->write(' <info>Re-applying stashed changes');
if (0 !== $this->process->execute('git stash pop', $output, $path)) { if (0 !== $this->process->execute('git stash pop', $output, $path)) {
throw new \RuntimeException("Failed to apply stashed changes:\n\n".$this->process->getErrorOutput()); throw new \RuntimeException("Failed to apply stashed changes:\n\n".$this->process->getErrorOutput());
} }
$this->hasStashedChanges = false;
} }
} }