check first if there are changes

11 years ago · 56f4625ec8
parent 48ac383599
commit 56f4625ec8
2 changed files with 8 additions and 8 deletions
--- a/src/Composer/Downloader/GitDownloader.php
+++ b/src/Composer/Downloader/GitDownloader.php
@ -90,6 +90,10 @@ class GitDownloader extends VcsDownloader
     */
    protected function cleanChanges($path, $update)
    {
+        if (!$changes = $this->getLocalChanges($path)) {
+            return;
+        }
+
        $discardChanges = $this->config->get('discard-changes');
        if (!$this->io->isInteractive()) {
            switch ($discardChanges) {
@ -109,10 +113,6 @@ class GitDownloader extends VcsDownloader
            }
        }

-        if (!$changes = $this->getLocalChanges($path)) {
-            return;
-        }
-
        $changes = array_map(function ($elem) {
            return '    '.$elem;
        }, preg_split('{\s*\r?\n\s*}', $changes));
--- a/src/Composer/Downloader/SvnDownloader.php
+++ b/src/Composer/Downloader/SvnDownloader.php
@ -88,6 +88,10 @@ class SvnDownloader extends VcsDownloader
     */
    protected function cleanChanges($path, $update)
    {
+        if (!$changes = $this->getLocalChanges($path)) {
+            return;
+        }
+
        $discardChanges = $this->config->get('discard-changes');
        if (!$this->io->isInteractive()) {
            switch ($discardChanges) {
@ -101,10 +105,6 @@ class SvnDownloader extends VcsDownloader
            }
        }

-        if (!$changes = $this->getLocalChanges($path)) {
-            return;
-        }
-
        $changes = array_map(function ($elem) {
            return '    '.$elem;
        }, preg_split('{\s*\r?\n\s*}', $changes));