diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:53:58 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:53:58 -0400 |
commit | 122b09e2f24cff55c65b84cbccd78ed640a234be (patch) | |
tree | 5f9f1929b2fccb9d9a783a0a53f56ba13aae7897 /Git/Config.hs | |
parent | 1b18f539f2bace903c853ce828902a8061007da5 (diff) | |
download | git-repair-122b09e2f24cff55c65b84cbccd78ed640a234be.tar.gz |
Merge from git-annex.
Diffstat (limited to 'Git/Config.hs')
-rw-r--r-- | Git/Config.hs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Git/Config.hs b/Git/Config.hs index 3d62395..65bd9b7 100644 --- a/Git/Config.hs +++ b/Git/Config.hs @@ -79,10 +79,6 @@ global = do {- Reads git config from a handle and populates a repo with it. -} hRead :: Repo -> Handle -> IO Repo hRead repo h = do - -- We use the FileSystemEncoding when reading from git-config, - -- because it can contain arbitrary filepaths (and other strings) - -- in any encoding. - fileEncoding h val <- hGetContentsStrict h store val repo @@ -167,7 +163,6 @@ coreBare = "core.bare" fromPipe :: Repo -> String -> [CommandParam] -> IO (Either SomeException (Repo, String)) fromPipe r cmd params = try $ withHandle StdoutHandle createProcessSuccess p $ \h -> do - fileEncoding h val <- hGetContentsStrict h r' <- store val r return (r', val) |