From b8a408883ce0f0597ad2d34cd22c8d02e25362cc Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 24 Oct 2012 12:10:32 +0200 Subject: [PATCH] Reset state after applying stash, fixes #1254 --- src/Composer/Downloader/GitDownloader.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php index c7c1774b8..2c1cb3079 100644 --- a/src/Composer/Downloader/GitDownloader.php +++ b/src/Composer/Downloader/GitDownloader.php @@ -157,6 +157,7 @@ class GitDownloader extends VcsDownloader if (0 !== $this->process->execute('git stash pop', $output, $path)) { throw new \RuntimeException("Failed to apply stashed changes:\n\n".$this->process->getErrorOutput()); } + $this->hasStashedChanges = false; } }