diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-09 01:57:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-09 01:57:13 -0400 |
| commit | d64132a43ae176e8a1353d5463c5387a93da9ad7 (patch) | |
| tree | b98b328a292807c00e4b9590e7cf3094ec176a49 /Annex | |
| parent | e3f1568e0ff7dc872f3782115c74b9e7d8c291b2 (diff) | |
hslint
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 2 | ||||
| -rw-r--r-- | Annex/Content.hs | 2 | ||||
| -rw-r--r-- | Annex/Ssh.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index a89066881..8f0a09fd6 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -141,7 +141,7 @@ update = onceonly $ do let merge_desc = if null branches then "update" else "merging " ++ - (unwords $ map (show . Git.refDescribe) branches) ++ + unwords (map (show . Git.refDescribe) branches) ++ " into " ++ show name unless (null branches) $ do showSideAction merge_desc diff --git a/Annex/Content.hs b/Annex/Content.hs index 90bde2975..3f1db37b5 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -43,7 +43,7 @@ import Annex.Exception {- Checks if a given key's content is currently present. -} inAnnex :: Key -> Annex Bool -inAnnex = inAnnex' $ doesFileExist +inAnnex = inAnnex' doesFileExist inAnnex' :: (FilePath -> IO a) -> Key -> Annex a inAnnex' a key = do whenM (fromRepo Git.repoIsUrl) $ diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index f8cd5d9bc..6893f94ef 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -43,7 +43,7 @@ git_annex_shell r command params shellcmd = "git-annex-shell" shellopts = Param command : File dir : params sshcmd uuid = unwords $ - shellcmd : (map shellEscape $ toCommand shellopts) ++ + shellcmd : map shellEscape (toCommand shellopts) ++ uuidcheck uuid uuidcheck NoUUID = [] uuidcheck (UUID u) = ["--uuid", u] |