deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-05-17 21:26:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #285 from MikeTralala/patch-1

Browse source 
Change the point the current branch is saved.
This commit is contained in:
Andrés Montañez 2017-01-02 15:25:52 -03:00 committed by GitHub
parent b9a63568a1 37d28e57cd
commit 8ab3a25a72
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}