From a0b643354907628a16f927935de0396382239c59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 12 Oct 2012 12:19:30 -0400
Subject: Fix a crash when merging files in the git-annex branch that contain
 invalid utf8.

The crash actually occurred when writing out the file, which was done to a
handle that had not had fileSystemEncoding applied to it.
---
 Git/Command.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Git')

diff --git a/Git/Command.hs b/Git/Command.hs
index 0a324ea00..5f2dd47b0 100644
--- a/Git/Command.hs
+++ b/Git/Command.hs
@@ -73,7 +73,7 @@ pipeReadStrict params repo = assertLocal repo $
 pipeWriteRead :: [CommandParam] -> String -> Repo -> IO String
 pipeWriteRead params s repo = assertLocal repo $
 	writeReadProcessEnv "git" (toCommand $ gitCommandLine params repo) 
-		(gitEnv repo) s
+		(gitEnv repo) s (Just fileEncoding)
 
 {- Runs a git subcommand, feeding it input on a handle with an action. -}
 pipeWrite :: [CommandParam] -> Repo -> (Handle -> IO ()) -> IO ()
-- 
cgit v1.2.3