merge git command queue when joining with concurrent thread

This commit is contained in:
Joey Hess 2015-11-05 18:21:48 -04:00
parent ab6b1edfee
commit 31472161e4
Failed to extract signature
3 changed files with 37 additions and 13 deletions

View file

@ -12,6 +12,7 @@ import Annex
import Annex.CatFile
import Annex.CheckAttr
import Annex.CheckIgnore
import qualified Annex.Queue
import qualified Data.Map as M
@ -57,6 +58,7 @@ mergeState st = do
st' <- liftIO $ snd <$> run st closehandles
forM_ (M.toList $ Annex.cleanup st') $
uncurry addCleanup
Annex.Queue.mergeFrom st'
changeState $ \s -> s { errcounter = errcounter s + errcounter st' }
where
closehandles = do