hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-09-04 08:28:57 +02:00
Code Issues Releases Wiki Activity

strategy git-rebase is enabled

Browse Source
This commit is contained in:
juanda
2014-05-07 12:55:14 +02:00
parent 23b59869ec
commit 86ef278607
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php
+5 -5
View File
@@ -34,13 +34,13 @@ class GitRebaseTask extends AbstractTask implements IsReleaseAware
* @see \Mage\Task\AbstractTask::run()
*/
public function run()
{
$branch = $this->getParameter('branch');
$remote = $this->getParameter('remote');
{
$branch = $this->getParameter('branch', 'master');
$remote = $this->getParameter('remote', 'origin');
// Fetch Remote
$command = 'git fetch ' . $remote;
$result = $this->runCommandRemote($command) && $result;
$result = $this->runCommandRemote($command);
// Checkout
$command = 'git checkout ' . $branch;