diff options
Diffstat (limited to 'Git/CatFile.hs')
| -rwxr-xr-x | Git/CatFile.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Git/CatFile.hs b/Git/CatFile.hs index 88011f071..c1ba11bd9 100755 --- a/Git/CatFile.hs +++ b/Git/CatFile.hs @@ -59,6 +59,9 @@ catObjectDetails h object = CoProcess.query h send receive hPutStrLn to $ show object receive from = do fileEncoding from +#ifdef __WINDOWS__ + hSetNewlineMode from noNewlineTranslation +#endif header <- hGetLine from case words header of [sha, objtype, size] @@ -73,13 +76,10 @@ catObjectDetails h object = CoProcess.query h send receive | otherwise -> error $ "unknown response from git cat-file " ++ show (header, object) readcontent bytes from sha = do content <- S.hGet from bytes -#ifdef __WINDOWS__ - eatchar '\r' from -#endif eatchar '\n' from return $ Just (L.fromChunks [content], Ref sha) dne = return Nothing eatchar expected from = do c <- hGetChar from when (c /= expected) $ - error $ "missing " ++ (show c) ++ " from git cat-file" + error $ "missing " ++ (show expected) ++ " from git cat-file" |