summaryrefslogtreecommitdiff
path: root/Annex/Branch.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-16 00:41:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-16 00:44:51 -0400
commita1e52f0ce5984058c737ed709fc5d4b6398e019a (patch)
treebaaeb46b5eb5e7edb4a8a4ef80d6c1ab256bbcba /Annex/Branch.hs
parente7aaa55c53fb54c6dd5a1a1aeb0955b05227676b (diff)
hlint
Diffstat (limited to 'Annex/Branch.hs')
-rw-r--r--Annex/Branch.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 388cbc12d..acab417fb 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -116,7 +116,7 @@ updateTo pairs = do
-- check what needs updating before taking the lock
dirty <- journalDirty
(refs, branches) <- unzip <$> filterM isnewer pairs
- if (not dirty && null refs)
+ if not dirty && null refs
then updateIndex branchref
else withIndex $ lockJournal $ do
when dirty stageJournal
@@ -172,7 +172,7 @@ get' staleok file = fromcache =<< getCache file
- modifes the current content of the file on the branch.
-}
change :: FilePath -> (String -> String) -> Annex ()
-change file a = lockJournal $ getStale file >>= return . a >>= set file
+change file a = lockJournal $ a <$> getStale file >>= set file
{- Records new content of a file into the journal and cache. -}
set :: FilePath -> String -> Annex ()