From 37d28e57cd1626d70efcbade1fd4e0dcc45b3ae7 Mon Sep 17 00:00:00 2001 From: Mike Tralala Date: Mon, 7 Mar 2016 16:59:13 +0100 Subject: [PATCH] Change the point the current branch is saved. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- Mage/Task/BuiltIn/Scm/ChangeBranchTask.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/Task/BuiltIn/Scm/ChangeBranchTask.php b/Mage/Task/BuiltIn/Scm/ChangeBranchTask.php index 36c27ea..fb98217 100644 --- a/Mage/Task/BuiltIn/Scm/ChangeBranchTask.php +++ b/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 = 'git checkout ' . $branch; $result = $this->runCommandLocal($command) && $result; - - self::$startingBranch = $currentBranch; } else { throw new SkipException; }