diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-05 18:21:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-05 18:21:48 -0400 |
| commit | a2c9cbbdc4047b799321ec388a94d4f96951a6f2 (patch) | |
| tree | 5dc73f5fca4209147b66cbb3b5d471b278e5ced4 /Annex/Concurrent.hs | |
| parent | e0d5901349c15b3eeace319cbe8854e655a602d6 (diff) | |
merge git command queue when joining with concurrent thread
Diffstat (limited to 'Annex/Concurrent.hs')
| -rw-r--r-- | Annex/Concurrent.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Annex/Concurrent.hs b/Annex/Concurrent.hs index 5faa98a47..787c3e446 100644 --- a/Annex/Concurrent.hs +++ b/Annex/Concurrent.hs @@ -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 |