This commit is contained in:
Joey Hess 2011-12-09 01:57:13 -04:00
parent e3f1568e0f
commit d64132a43a
16 changed files with 25 additions and 29 deletions

View file

@ -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

View file

@ -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) $

View file

@ -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]