mirror of
https://github.com/hauke68/Magallanes.git
synced 2025-09-13 12:40:18 +02:00
Change runCommandRemote() to runCommand()
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:
parent
609745ccc4
commit
c010fc662e
@ -65,13 +65,13 @@ class ForceUpdateTask extends AbstractTask
|
|||||||
$remote = $this->getParameter('remote', 'origin');
|
$remote = $this->getParameter('remote', 'origin');
|
||||||
|
|
||||||
$command = 'git fetch ' . $remote . ' ' . $branch;
|
$command = 'git fetch ' . $remote . ' ' . $branch;
|
||||||
$result = $this->runCommandRemote($command);
|
$result = $this->runCommand($command);
|
||||||
|
|
||||||
$command = 'git reset --hard ' . $remote . '/' . $branch;
|
$command = 'git reset --hard ' . $remote . '/' . $branch;
|
||||||
$result = $result && $this->runCommandRemote($command);
|
$result = $result && $this->runCommand($command);
|
||||||
|
|
||||||
$command = 'git pull ' . $remote . ' ' . $branch;
|
$command = 'git pull ' . $remote . ' ' . $branch;
|
||||||
$result = $result && $this->runCommandRemote($command);
|
$result = $result && $this->runCommand($command);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@ -79,7 +79,6 @@ class ForceUpdateTask extends AbstractTask
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = $this->runCommandLocal($command);
|
|
||||||
$this->getConfig()->reload();
|
$this->getConfig()->reload();
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
Loading…
Reference in New Issue
Block a user