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

Merge pull request #59 from juanda/master

Browse Source 
strategy git-rebase is enabled
This commit is contained in:
Andrés Montañez
2014-05-14 17:37:52 -07:00
parent 23b59869ec 86ef278607
commit db6d0d4989
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Command/BuiltIn/DeployCommand.php
+5 -1
View File
@@ -310,7 +310,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
case 'targz': case 'targz':
$deployStrategy = 'deployment/strategy/tar-gz'; $deployStrategy = 'deployment/strategy/tar-gz';
break; break;
case 'git-rebase':
$deployStrategy = 'deployment/strategy/git-rebase';
break;
case 'guess': case 'guess':
default: default:
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) == true) {
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() * @see \Mage\Task\AbstractTask::run()
*/ */
public function run() public function run()
{ {
$branch = $this->getParameter('branch'); $branch = $this->getParameter('branch', 'master');
$remote = $this->getParameter('remote'); $remote = $this->getParameter('remote', 'origin');
// Fetch Remote // Fetch Remote
$command = 'git fetch ' . $remote; $command = 'git fetch ' . $remote;
$result = $this->runCommandRemote($command) && $result; $result = $this->runCommandRemote($command);
// Checkout // Checkout
$command = 'git checkout ' . $branch; $command = 'git checkout ' . $branch;