Bladeren bron

Reset state after applying stash, fixes #1254

Jordi Boggiano 12 jaren geleden
bovenliggende
commit
b8a408883c
1 gewijzigde bestanden met toevoegingen van 1 en 0 verwijderingen
  1. 1 0
      src/Composer/Downloader/GitDownloader.php

+ 1 - 0
src/Composer/Downloader/GitDownloader.php

@@ -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;
         }
         }
     }
     }