summaryrefslogtreecommitdiff
path: root/Branch.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-15 03:12:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-15 03:12:05 -0400
commite78475737636a5d1e0d0a36b475c300cc7bb56cc (patch)
tree1d88de569e951b66ff5321eefaec49ad4b33bf89 /Branch.hs
parent9bb797c0eae3c9d2f119a734762a6d5fa7321a80 (diff)
hlint tweaks
Did all sources except Remotes/* and Command/*
Diffstat (limited to 'Branch.hs')
-rw-r--r--Branch.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Branch.hs b/Branch.hs
index d091b6eda..c8e6bc2bb 100644
--- a/Branch.hs
+++ b/Branch.hs
@@ -87,7 +87,7 @@ withIndex' bootstrapping a = do
e <- liftIO $ doesFileExist f
unless e $ do
- unless bootstrapping $ create
+ unless bootstrapping create
liftIO $ createDirectoryIfMissing True $ takeDirectory f
liftIO $ unless bootstrapping $ genIndex g
@@ -187,7 +187,7 @@ updateRef ref
Param (name++".."++ref),
Params "--oneline -n1"
]
- if (null diffs)
+ if null diffs
then return Nothing
else do
showSideAction $ "merging " ++ shortref ref ++ " into " ++ name ++ "..."
@@ -305,7 +305,7 @@ getJournalFile file = do
{- List of journal files. -}
getJournalFiles :: Annex [FilePath]
-getJournalFiles = getJournalFilesRaw >>= return . map fileJournal
+getJournalFiles = fmap (map fileJournal) getJournalFilesRaw
getJournalFilesRaw :: Annex [FilePath]
getJournalFilesRaw = do