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 #260 from jhuet/patch-1

Browse source 
git local commands should be executed in the deployment:from directory
This commit is contained in:
Andrés Montañez 2017-01-02 15:06:28 -03:00 committed by GitHub
parent 7fd7e70b26 81a8ccdeb8
commit 458ca0466d
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

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