diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-12 12:19:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-12 12:19:30 -0400 |
| commit | a0b643354907628a16f927935de0396382239c59 (patch) | |
| tree | 1641aa8f5309f4d50631555c00df86ec3729a6a7 /Git | |
| parent | 4a63cdd9008bfe34af01c3662af512927a0cee0b (diff) | |
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.
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Command.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 () |