differentiate between concurrency enabled at command line and by git config

The latter should not affect --batch mode.
This commit is contained in:
Joey Hess 2020-09-16 11:41:28 -04:00
parent 8471df3b6d
commit 77c42782d0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 46 additions and 21 deletions

View file

@ -112,7 +112,7 @@ data AnnexState = AnnexState
, backend :: Maybe (BackendA Annex)
, remotes :: [Types.Remote.RemoteA Annex]
, output :: MessageState
, concurrency :: Concurrency
, concurrency :: ConcurrencySetting
, force :: Bool
, fast :: Bool
, daemon :: Bool
@ -171,7 +171,7 @@ newState c r = do
, backend = Nothing
, remotes = []
, output = o
, concurrency = NonConcurrent
, concurrency = ConcurrencyCmdLine NonConcurrent
, force = False
, fast = False
, daemon = False