public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

check first if there are changes

pull/1636/head
Ricard Clau 2013-02-28 19:44:29 +01:00
parent 48ac383599
commit 56f4625ec8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Downloader/GitDownloader.php
View File

@ -90,6 +90,10 @@ class GitDownloader extends VcsDownloader
*/ */
protected function cleanChanges($path, $update) protected function cleanChanges($path, $update)
{ {
if (!$changes = $this->getLocalChanges($path)) {
return;
}
$discardChanges = $this->config->get('discard-changes'); $discardChanges = $this->config->get('discard-changes');
if (!$this->io->isInteractive()) { if (!$this->io->isInteractive()) {
switch ($discardChanges) { switch ($discardChanges) {
@ -109,10 +113,6 @@ class GitDownloader extends VcsDownloader
} }
} }
if (!$changes = $this->getLocalChanges($path)) {
return;
}
$changes = array_map(function ($elem) { $changes = array_map(function ($elem) {
return ' '.$elem; return ' '.$elem;
}, preg_split('{\s*\r?\n\s*}', $changes)); }, preg_split('{\s*\r?\n\s*}', $changes));

8
src/Composer/Downloader/SvnDownloader.php
View File

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