mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-01 21:32:16 +02:00
Merge pull request #285 from MikeTralala/patch-1
Change the point the current branch is saved.
This commit is contained in:
commit
8ab3a25a72
|
@ -73,6 +73,8 @@ class ChangeBranchTask extends AbstractTask
|
||||||
$command = $preCommand . 'git branch | grep \'*\' | cut -d\' \' -f 2';
|
$command = $preCommand . 'git branch | grep \'*\' | cut -d\' \' -f 2';
|
||||||
$currentBranch = 'master';
|
$currentBranch = 'master';
|
||||||
$result = $this->runCommandLocal($command, $currentBranch);
|
$result = $this->runCommandLocal($command, $currentBranch);
|
||||||
|
|
||||||
|
self::$startingBranch = $currentBranch;
|
||||||
|
|
||||||
$scmData = $this->getConfig()->deployment('scm', false);
|
$scmData = $this->getConfig()->deployment('scm', false);
|
||||||
|
|
||||||
|
@ -88,8 +90,6 @@ class ChangeBranchTask extends AbstractTask
|
||||||
$branch = $this->getParameter('branch', $scmData['branch']);
|
$branch = $this->getParameter('branch', $scmData['branch']);
|
||||||
$command = $preCommand . 'git checkout ' . $branch;
|
$command = $preCommand . 'git checkout ' . $branch;
|
||||||
$result = $this->runCommandLocal($command) && $result;
|
$result = $this->runCommandLocal($command) && $result;
|
||||||
|
|
||||||
self::$startingBranch = $currentBranch;
|
|
||||||
} else {
|
} else {
|
||||||
throw new SkipException;
|
throw new SkipException;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue