From 81a8ccdeb811ad43475eec651ec807e96422fafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Wed, 21 Oct 2015 17:01:41 +0200 Subject: [PATCH] git local commands should be executed in the deployment:from directory bis --- 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..cb764da 100644 --- a/Mage/Task/BuiltIn/Scm/ChangeBranchTask.php +++ b/Mage/Task/BuiltIn/Scm/ChangeBranchTask.php @@ -77,7 +77,7 @@ class ChangeBranchTask extends AbstractTask $scmData = $this->getConfig()->deployment('scm', false); if ($result && is_array($scmData) && isset($scmData['branch']) && $scmData['branch'] != $currentBranch) { - $command = 'git branch | grep \'' . $scmData['branch'] . '\' | tr -s \' \' | sed \'s/^[ ]//g\''; + $command = $preCommand . 'git branch | grep \'' . $scmData['branch'] . '\' | tr -s \' \' | sed \'s/^[ ]//g\''; $isBranchTracked = ''; $result = $this->runCommandLocal($command, $isBranchTracked); @@ -86,7 +86,7 @@ class ChangeBranchTask extends AbstractTask } $branch = $this->getParameter('branch', $scmData['branch']); - $command = 'git checkout ' . $branch; + $command = $preCommand . 'git checkout ' . $branch; $result = $this->runCommandLocal($command) && $result; self::$startingBranch = $currentBranch;