diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-12 14:32:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-12 14:32:56 -0400 |
| commit | efef527d5b2e42e261fa7af6947aad6553426ebe (patch) | |
| tree | 082a5dad993557e9dffd76a69d4087371da8ed42 /Git/Config.hs | |
| parent | ab1cf3570207bd08ae0abbba183a8c570c0361f5 (diff) | |
| download | git-repair-efef527d5b2e42e261fa7af6947aad6553426ebe.tar.gz | |
Merge from git-annex.
Includes changing to new exceptions library, and some whitespace fixes.
Diffstat (limited to 'Git/Config.hs')
| -rw-r--r-- | Git/Config.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Git/Config.hs b/Git/Config.hs index d998fd1..32c0dd1 100644 --- a/Git/Config.hs +++ b/Git/Config.hs @@ -9,7 +9,6 @@ module Git.Config where import qualified Data.Map as M import Data.Char -import Control.Exception.Extensible import Common import Git @@ -168,7 +167,7 @@ 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 + fileEncoding h val <- hGetContentsStrict h r' <- store val r return (r', val) |