summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-15 18:46:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-15 18:46:38 -0400
commitbc0583fc9a7addefba04d7068fa1799dd5906383 (patch)
tree99fd36541310a32b54e1fa912d1ae99aced1df26 /Annex.hs
parent4d5098adf0c019ef6295819b55b67852aac494e6 (diff)
start one git-cat-file per index file
This reverts a5031031f0d596b2381a785925beb574d90a862e and properly fixes the issue discussed there. This makes git-annex behave much nicer in direct mode.
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex.hs b/Annex.hs
index 3893f61e6..f9cbfef0d 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -103,7 +103,7 @@ data AnnexState = AnnexState
, auto :: Bool
, branchstate :: BranchState
, repoqueue :: Maybe Git.Queue.Queue
- , catfilehandle :: Maybe CatFileHandle
+ , catfilehandles :: M.Map FilePath CatFileHandle
, checkattrhandle :: Maybe CheckAttrHandle
, forcebackend :: Maybe String
, limit :: Matcher (FileInfo -> Annex Bool)
@@ -133,7 +133,7 @@ newState gitrepo = AnnexState
, auto = False
, branchstate = startBranchState
, repoqueue = Nothing
- , catfilehandle = Nothing
+ , catfilehandles = M.empty
, checkattrhandle = Nothing
, forcebackend = Nothing
, limit = Left []