Browse Source

Always reset stash change, refs #1254

Jordi Boggiano 12 years ago
parent
commit
a7cc5f187f
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/Composer/Downloader/GitDownloader.php

+ 1 - 1
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;
         }
     }