Merge pull request #285 from MikeTralala/patch-1

Change the point the current branch is saved.

Mage/Task/BuiltIn/Scm/ChangeBranchTask.php

@@ -74,6 +74,8 @@ class ChangeBranchTask extends AbstractTask
                     $currentBranch = 'master';
                     $result = $this->runCommandLocal($command, $currentBranch);
                     
+                    self::$startingBranch = $currentBranch;
+
                     $scmData = $this->getConfig()->deployment('scm', false);
 
                     if ($result && is_array($scmData) && isset($scmData['branch']) && $scmData['branch'] != $currentBranch) {
@@ -88,8 +90,6 @@ class ChangeBranchTask extends AbstractTask
                         $branch = $this->getParameter('branch', $scmData['branch']);
                         $command = $preCommand . 'git checkout ' . $branch;
                         $result = $this->runCommandLocal($command) && $result;
-
-                        self::$startingBranch = $currentBranch;
                     } else {
                         throw new SkipException;
                     }