aboutsummaryrefslogtreecommitdiff
path: root/Git/Queue.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-01 16:05:02 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-01 16:16:08 -0400
commit3d49258e5bed4d9a6ec9e24ddb776f277542664b (patch)
tree89af32cbdde6a5e672c357c24fe281337e2a133a /Git/Queue.hs
parent6c64a214fa569dcf1fa8cc4c79efd90d01ff5705 (diff)
attempt at a quick, utf-8 only fix to the ghc 7.4 problem
If you have only utf-8 filenames, and need to build git-annex with ghc 7.4, this will work. But, it will crash on non-utf-8 filenames.
Diffstat (limited to 'Git/Queue.hs')
-rw-r--r--Git/Queue.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Git/Queue.hs b/Git/Queue.hs
index 25c5b073c..63c3adee7 100644
--- a/Git/Queue.hs
+++ b/Git/Queue.hs
@@ -18,8 +18,9 @@ import qualified Data.Map as M
import System.IO
import System.Cmd.Utils
import Data.String.Utils
-import Utility.SafeCommand
+import Codec.Binary.UTF8.String
+import Utility.SafeCommand
import Common
import Git
import Git.Command
@@ -90,4 +91,4 @@ runAction repo action files =
where
params = toCommand $ gitCommandLine
(Param (getSubcommand action):getParams action) repo
- feedxargs h = hPutStr h $ join "\0" files
+ feedxargs h = hPutStr h $ join "\0" $ map encodeString files