From 7a6fb8ae4e455ea311213da50cc5e8cd6d5667b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 20:41:22 -0400 Subject: 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. --- Annex/Queue.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Annex/Queue.hs') 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 () -- cgit v1.2.3