summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-04 13:03:33 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-04 13:03:33 -0400
commitdc682e53a2971a4e1ca89a997dcb44406aa5be75 (patch)
tree46e3bc85da9cb607babda6453a41d26a4d1e3bb7 /Git
parent586be399523a9a0ae1ed39d34b84c2c78296b457 (diff)
use fileEncoding for git-update-index input handle
Diffstat (limited to 'Git')
-rw-r--r--Git/UnionMerge.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index 15bff6052..be8eb10d9 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -57,6 +57,7 @@ update_index repo ls = stream_update_index repo [(`mapM_` ls)]
stream_update_index :: Repo -> [Streamer] -> IO ()
stream_update_index repo as = do
(p, h) <- hPipeTo "git" (toCommand $ gitCommandLine params repo)
+ fileEncoding h
forM_ as (stream h)
hClose h
forceSuccess p