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

Reset state after applying stash, fixes #1254

pull/1020/merge
Jordi Boggiano 2012-10-24 12:10:32 +02:00
parent 48b7e329c1
commit b8a408883c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,7 @@ class GitDownloader extends VcsDownloader
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;
} }
} }