deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-06-24 08:10:07 +02:00
Code Issues Projects 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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage/Command/BuiltIn/DeployCommand.php
View file

@ -310,7 +310,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
case 'targz':
$deployStrategy = 'deployment/strategy/tar-gz';
break;
case 'git-rebase':
$deployStrategy = 'deployment/strategy/git-rebase';
break;
case 'guess':
default:
if ($this->getConfig()->release('enabled', false) == true) {

10
Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php
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;