summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-22 20:24:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-22 20:24:53 -0400
commit4d376b47b7aa506c4f4a4c5ccc83ca2ef1aeacc2 (patch)
tree33ab2e7c4b72d8a7fce40a0e93f63f3d50a6c3ab /Git
parentf672c39279366a8927abfcde3050952365f5e0ee (diff)
expose Control.Monad.join
I think I've been looking for that function for some time. Ie, I remember wanting to collapse Just Nothing to Nothing.
Diffstat (limited to 'Git')
-rw-r--r--Git/Construct.hs3
-rw-r--r--Git/Queue.hs3
2 files changed, 3 insertions, 3 deletions
diff --git a/Git/Construct.hs b/Git/Construct.hs
index 7500617a0..633e50b6b 100644
--- a/Git/Construct.hs
+++ b/Git/Construct.hs
@@ -130,7 +130,8 @@ remoteNamed n constructor = do
remoteNamedFromKey :: String -> IO Repo -> IO Repo
remoteNamedFromKey k = remoteNamed basename
where
- basename = join "." $ reverse $ drop 1 $ reverse $ drop 1 $ split "." k
+ basename = intercalate "." $
+ reverse $ drop 1 $ reverse $ drop 1 $ split "." k
{- Constructs a new Repo for one of a Repo's remotes using a given
- location (ie, an url). -}
diff --git a/Git/Queue.hs b/Git/Queue.hs
index 712d476cd..d88c71880 100644
--- a/Git/Queue.hs
+++ b/Git/Queue.hs
@@ -20,7 +20,6 @@ module Git.Queue (
import qualified Data.Map as M
import System.IO
import System.Process
-import Data.String.Utils
import Utility.SafeCommand
import Common
@@ -151,7 +150,7 @@ runAction repo (UpdateIndexAction streamers) =
runAction repo action@(CommandAction {}) =
withHandle StdinHandle createProcessSuccess p $ \h -> do
fileEncoding h
- hPutStr h $ join "\0" $ getFiles action
+ hPutStr h $ intercalate "\0" $ getFiles action
hClose h
where
p = (proc "xargs" params) { env = gitEnv repo }