summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-10 15:36:54 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-11 00:06:54 -0400
commitabdacf58ed5d0da0439819feb669b04b2368bb92 (patch)
tree77694958b647c8015104d1d8151a744a03666070 /Annex
parent16e7178f207b0472346c06f30aa210cebe373c36 (diff)
tweaks
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 8f07b7aa2..a653a4995 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -68,15 +68,15 @@ create = do
return ()
{- Returns the ref of the branch, creating it first if necessary. -}
-getBranch :: Annex (Git.Ref)
-getBranch = maybe (hasOrigin >>= go >>= use) (return) =<< branchsha
+getBranch :: Annex Git.Ref
+getBranch = maybe (hasOrigin >>= go >>= use) return =<< branchsha
where
go True = do
inRepo $ Git.Command.run "branch"
[Param $ show name, Param $ show originname]
fromMaybe (error $ "failed to create " ++ show name)
<$> branchsha
- go False = withIndex' True $ do
+ go False = withIndex' True $
inRepo $ Git.Branch.commit "branch created" fullname []
use sha = do
setIndexSha sha