hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-11-04 09:00:18 +01:00
Code Issues Releases Wiki Activity

Change runCommandRemote() to runCommand()

Browse Source 
Change runCommandRemote() to runCommand(), you decide if the command is
running local or remote depending of the stage you put the
scm/force-update task. Remove the last $result =
$this->runCommandLocal($command), not necessary.
This commit is contained in:
samuel4x4 2014-11-23 23:03:31 +02:00
parent 609745ccc4
commit c010fc662e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mage/Task/BuiltIn/Scm/ForceUpdateTask.php
View File

@ -65,13 +65,13 @@ class ForceUpdateTask extends AbstractTask
$remote = $this->getParameter('remote', 'origin');
$command = 'git fetch ' . $remote . ' ' . $branch;
$result = $this->runCommandRemote($command);
$result = $this->runCommand($command);
$command = 'git reset --hard ' . $remote . '/' . $branch;
$result = $result && $this->runCommandRemote($command);
$result = $result && $this->runCommand($command);
$command = 'git pull ' . $remote . ' ' . $branch;
$result = $result && $this->runCommandRemote($command);
$result = $result && $this->runCommand($command);
break;
default:
@ -79,7 +79,6 @@ class ForceUpdateTask extends AbstractTask
break;
}
$result = $this->runCommandLocal($command);
$this->getConfig()->reload();
return $result;