summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-04 20:41:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-04 20:41:22 -0400
commit7a6fb8ae4e455ea311213da50cc5e8cd6d5667b2 (patch)
tree7b4f8545b70fe8e18fa0eabbd7542fdf397eac7b /Annex
parentbd7857d903a602bc5f1d5e01f0b936bb5b41b5c6 (diff)
flush the git queue when a new type of action is being added to it
This allows the queue to be used in a single process for multiple possibly conflicting commands, like add and rm, without running them out of order. This assumes that running the same git subcommand with different parameters cannot itself conflict.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Queue.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Queue.hs b/Annex/Queue.hs
index 24575e906..d4a2c592e 100644
--- a/Annex/Queue.hs
+++ b/Annex/Queue.hs
@@ -20,7 +20,7 @@ import Config
add :: String -> [CommandParam] -> [FilePath] -> Annex ()
add command params files = do
q <- get
- store $ Git.Queue.add q command params files
+ store =<< inRepo (Git.Queue.add q command params files)
{- Runs the queue if it is full. Should be called periodically. -}
flushWhenFull :: Annex ()