Browse Source

Merge pull request #285 from MikeTralala/patch-1

Change the point the current branch is saved.
1.0
Andrés Montañez 8 years ago committed by GitHub
parent
commit
8ab3a25a72
  1. 4
      Mage/Task/BuiltIn/Scm/ChangeBranchTask.php

4
Mage/Task/BuiltIn/Scm/ChangeBranchTask.php

@ -73,6 +73,8 @@ class ChangeBranchTask extends AbstractTask
$command = $preCommand . 'git branch | grep \'*\' | cut -d\' \' -f 2';
$currentBranch = 'master';
$result = $this->runCommandLocal($command, $currentBranch);
self::$startingBranch = $currentBranch;
$scmData = $this->getConfig()->deployment('scm', false);
@ -88,8 +90,6 @@ class ChangeBranchTask extends AbstractTask
$branch = $this->getParameter('branch', $scmData['branch']);
$command = $preCommand . 'git checkout ' . $branch;
$result = $this->runCommandLocal($command) && $result;
self::$startingBranch = $currentBranch;
} else {
throw new SkipException;
}

Loading…
Cancel
Save