summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command.hs2
-rw-r--r--GitRepo.hs4
-rw-r--r--Locations.hs2
-rw-r--r--git-annex-shell.hs2
-rw-r--r--test.hs2
5 files changed, 6 insertions, 6 deletions
diff --git a/Command.hs b/Command.hs
index bebbf3f1b..298234fa0 100644
--- a/Command.hs
+++ b/Command.hs
@@ -187,7 +187,7 @@ filterFiles l = do
let regexp = compile (toregex exclude) []
return $ filter (notExcluded regexp) l'
where
- notState f = not $ isPrefixOf stateDir f
+ notState f = not $ stateDir `isPrefixOf` f
notExcluded r f = case match r f [] of
Nothing -> True
Just _ -> False
diff --git a/GitRepo.hs b/GitRepo.hs
index ec363fe73..4e69544d4 100644
--- a/GitRepo.hs
+++ b/GitRepo.hs
@@ -323,7 +323,7 @@ configRemotes repo = map construct remotepairs
| otherwise = repoFromPath v
-- git remotes can be written scp style -- [user@]host:dir
-- where dir is relative to the user's home directory.
- scpstyle v = isInfixOf ":" v && (not $ isInfixOf "//" v)
+ scpstyle v = ":" `isInfixOf` v && (not $ "//" `isInfixOf` v)
scptourl v = "ssh://" ++ host ++ slash dir
where
bits = split ":" v
@@ -458,7 +458,7 @@ prop_idempotent_deencode s = s == decodeGitFile (encodeGitFile s)
-}
absDir :: String -> IO String
absDir d
- | isPrefixOf "/" d = expandt d
+ | "/" `isPrefixOf` d = expandt d
| otherwise = do
h <- myhomedir
return $ h ++ d
diff --git a/Locations.hs b/Locations.hs
index b2624754e..75843c29e 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -93,7 +93,7 @@ gitAnnexUnusedLog r = gitAnnexDir r </> "unused"
{- Checks a symlink target to see if it appears to point to annexed content. -}
isLinkToAnnex :: FilePath -> Bool
-isLinkToAnnex s = isInfixOf ("/" ++ objectDir) s
+isLinkToAnnex s = ("/" ++ objectDir) `isInfixOf` s
{- Converts a key into a filename fragment.
-
diff --git a/git-annex-shell.hs b/git-annex-shell.hs
index 78dd77790..fa2a7f606 100644
--- a/git-annex-shell.hs
+++ b/git-annex-shell.hs
@@ -51,7 +51,7 @@ main' c@(cmd:dir:params)
main' c@(cmd:_)
-- Handle the case of being the user's login shell. It will be passed
-- a single string containing all the real parameters.
- | isPrefixOf "git-annex-shell " cmd = main' $ drop 1 $ shellUnEscape cmd
+ | "git-annex-shell " `isPrefixOf` cmd = main' $ drop 1 $ shellUnEscape cmd
| elem cmd builtins = failure
| otherwise = external c
diff --git a/test.hs b/test.hs
index d7a6bd152..5dda3b835 100644
--- a/test.hs
+++ b/test.hs
@@ -88,7 +88,7 @@ test_init = "git-annex init" ~: TestCase $ innewrepo $ do
e <- doesFileExist annexlog
e @? (annexlog ++ " not created")
c <- readFile annexlog
- isInfixOf reponame c @? annexlog ++ " does not contain repo name"
+ reponame `isInfixOf` c @? annexlog ++ " does not contain repo name"
where
annexlog = ".git-annex/uuid.log"
reponame = "test repo"