git-jump 0.1.0.2 → 0.1.0.3

raw patch · 2 files changed

+7/−6 lines, 2 files

Files

git-jump.cabal +1/−1
git-jump.hs +6/−5

git-jump.cabal view

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                git-jump-version:             0.1.0.2+version:             0.1.0.3 synopsis:            Move a git branch description:         Move a git branch to a specified refspec (or to the upstream position)                      Along with any uncommited changes.

git-jump.hs view

@@ -32,11 +32,12 @@     do         progName <- getProgName         args <- getArgs-        destRef <--            case args of-            [] -> revParse ["--symbolic-full-name", "@{u}"]-            [refSpec] -> return refSpec-            _ -> fail $ "Usage: " ++ progName ++ "[refspec]\n    if refspec is not provided, the remote tracked branch is used"+        let destRefSpec =+                case args of+                [] -> "@{u}"+                [refSpec] -> refSpec+                _ -> fail $ "Usage: " ++ progName ++ "[refspec]\n    if refspec is not provided, the remote tracked branch is used"+        destRef <- revParse [destRefSpec]         origPos <- revParse ["HEAD"]         git_ "commit" ["--allow-empty", "-mSTAGING"]         staging <- revParse ["HEAD"]