hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-11-04 09:00:18 +01:00
Code Issues Releases Wiki Activity

Change the point the current branch is saved.

Browse Source 
This is necessary to save to reverse back to the right branch if another branch is used than 'master' and you´re currently working in the deployed branch.
This commit is contained in:
Mike Tralala 2016-03-07 16:59:13 +01:00
parent dd79eca75f
commit 37d28e57cd
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 = 'git checkout ' . $branch;
$result = $this->runCommandLocal($command) && $result;
self::$startingBranch = $currentBranch;
} else {
throw new SkipException;
}