From 2db8167ddbfa080b44509d4532d7d34887cdc64a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jun 2021 13:28:25 -0400 Subject: merge from git-annex Fixes 2 bugs, one a data loss bug. It is possible to get those fixes without merging all the other changes, if a backport is wanted. --- Git/CatFile.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Git/CatFile.hs') diff --git a/Git/CatFile.hs b/Git/CatFile.hs index 6bea8c0..b9f8305 100644 --- a/Git/CatFile.hs +++ b/Git/CatFile.hs @@ -326,7 +326,7 @@ catObjectStream repo a = withCatFileStream False repo go (hClose hin) (catObjectReader readObjectContent c hout) feeder c h (v, ref) = do - liftIO $ writeChan c (ref, v) + writeChan c (ref, v) S8.hPutStrLn h (fromRef' ref) catObjectMetaDataStream -- cgit v1.2.3