hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-13 20:50:18 +02:00
Code Issues Releases Wiki Activity

[Nostromo] git/change-branc, Mess Detector recommendations.

Browse Source
This commit is contained in:
Andrés Montañez 2017-01-08 00:53:20 -03:00
parent 0c43296d41
commit 89e780a0bf
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Mage/Task/BuiltIn/Git/ChangeBranchTask.php
View File

@ -41,26 +41,24 @@ class ChangeBranchTask extends AbstractTask
public function execute() public function execute()
{ {
$options = $this->getOptions(); $options = $this->getOptions();
$branch = $options['branch']; $branch = $this->runtime->getVar('git_revert_branch', false);
if (!$this->runtime->getVar('git_revert_branch', false)) { if ($branch === false) {
$cmdGetCurrent = sprintf('%s branch | grep "*"', $options['path']); $cmdGetCurrent = sprintf('%s branch | grep "*"', $options['path']);
/** @var Process $process */ /** @var Process $process */
$process = $this->runtime->runLocalCommand($cmdGetCurrent); $process = $this->runtime->runLocalCommand($cmdGetCurrent);
if ($process->isSuccessful()) { if (!$process->isSuccessful()) {
$initialBranch = str_replace('* ', '', trim($process->getOutput()));
if ($initialBranch == $branch) {
throw new SkipException();
} else {
$this->runtime->setVar('git_revert_branch', $initialBranch);
}
} else {
return false; return false;
} }
} else {
$branch = $this->runtime->getVar('git_revert_branch'); $currentBranch = str_replace('* ', '', trim($process->getOutput()));
if ($currentBranch == $options['branch']) {
throw new SkipException();
}
$branch = $options['branch'];
$this->runtime->setVar('git_revert_branch', $currentBranch);
} }
$cmdChange = sprintf('%s checkout %s', $options['path'], $branch); $cmdChange = sprintf('%s checkout %s', $options['path'], $branch);