summaryrefslogtreecommitdiff
path: root/Git/CatFile.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2021-06-29 13:28:25 -0400
committerJoey Hess <joeyh@joeyh.name>2021-06-29 13:28:25 -0400
commit2db8167ddbfa080b44509d4532d7d34887cdc64a (patch)
tree997c359eaac8297ac01374d96c012d64c4913407 /Git/CatFile.hs
parent84db819626232d789864780a52b63a787d49ef52 (diff)
downloadgit-repair-2db8167ddbfa080b44509d4532d7d34887cdc64a.tar.gz
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.
Diffstat (limited to 'Git/CatFile.hs')
-rw-r--r--Git/CatFile.hs2
1 files changed, 1 insertions, 1 deletions
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