From a7cc5f187f9c59d6aafe6f8be43989b815367a64 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 24 Oct 2012 12:30:11 +0200
Subject: [PATCH] Always reset stash change, refs #1254

---
 src/Composer/Downloader/GitDownloader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php
index 2c1cb3079..b4deda07a 100644
--- a/src/Composer/Downloader/GitDownloader.php
+++ b/src/Composer/Downloader/GitDownloader.php
@@ -153,11 +153,11 @@ class GitDownloader extends VcsDownloader
     protected function reapplyChanges($path)
     {
         if ($this->hasStashedChanges) {
+            $this->hasStashedChanges = false;
             $this->io->write('    <info>Re-applying stashed changes');
             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;
         }
     }