mirror of
https://github.com/hauke68/Magallanes.git
synced 2026-09-06 09:28:57 +02:00
PSR-2 Fixer
This commit is contained in:
@@ -69,7 +69,6 @@ class ChangeBranchTask extends AbstractTask
|
||||
if ($this->getParameter('_changeBranchRevert', false)) {
|
||||
$command = $preCommand . 'git checkout ' . self::$startingBranch;
|
||||
$result = $this->runCommandLocal($command);
|
||||
|
||||
} else {
|
||||
$command = $preCommand . 'git branch | grep \'*\' | cut -d\' \' -f 2';
|
||||
$currentBranch = 'master';
|
||||
|
||||
@@ -15,9 +15,9 @@ use Mage\Task\SkipException;
|
||||
|
||||
/**
|
||||
* Task for Force Updating a Working Copy
|
||||
*
|
||||
*
|
||||
* 'git fetch' downloads the latest from remote without trying to merge or rebase anything.
|
||||
* 'git reset' resets the master branch to what you just fetched.
|
||||
* 'git reset' resets the master branch to what you just fetched.
|
||||
* The '--hard' option changes all the files in your working tree to match the files in origin/master,
|
||||
* so if you have any local changes, they will be lost.
|
||||
*
|
||||
|
||||
@@ -54,7 +54,7 @@ class UpdateTask extends AbstractTask
|
||||
*/
|
||||
public function run()
|
||||
{
|
||||
$command = 'cd ' . $this->getConfig()->deployment('from', './') . '; ';
|
||||
$command = 'cd ' . $this->getConfig()->deployment('from', './') . '; ';
|
||||
switch ($this->getConfig()->general('scm')) {
|
||||
case 'git':
|
||||
$command .= 'git pull';
|
||||
|
||||
Reference in New Issue
Block a user