diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:19:00 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:22:43 -0400 |
commit | 332e98b6cb1091c46221e2d8579a0035ba4dff51 (patch) | |
tree | 7c80c508ddf408951a6ffc0c419c84094736e781 /Command/Sync.hs | |
parent | 527b6970457e74f8c88dfdac7c96241e2496a2f2 (diff) |
arrange for regional output manager to run when -J is enabled
Commands that want to use it have to run their seek action inside
allowConcurrentOutput. Which seems reasonable; perhaps some future command
will want to support the -J flag but not use regions.
The region state moved from Annex to MessageState. This makes sense
organizationally, and note that some uses of onLocal use a different Annex
state, but pass the MessageState into it, which is what is needed.
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index fffc113d2..2de92188b 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -93,7 +93,7 @@ optParser desc = SyncOptions <*> optional parseAllOption seek :: SyncOptions -> CommandSeek -seek o = do +seek o = allowConcurrentOutput $ do prepMerge -- There may not be a branch checked out until after the commit, |