fix --json-progress --json to be same as --json --json-progress
Fix behavior of --json-progress followed by --json, in which the latter option disabled the former. This commit was supported by the NSF-funded DataLad project.
This commit is contained in:
parent
8ccfbd14d0
commit
fa65f1d240
5 changed files with 35 additions and 12 deletions
3
Annex.hs
3
Annex.hs
|
@ -275,7 +275,8 @@ addCleanup k a = changeState $ \s ->
|
|||
{- Sets the type of output to emit. -}
|
||||
setOutput :: OutputType -> Annex ()
|
||||
setOutput o = changeState $ \s ->
|
||||
s { output = (output s) { outputType = o } }
|
||||
let m = output s
|
||||
in s { output = m { outputType = adjustOutputType (outputType m) o } }
|
||||
|
||||
{- Checks if a flag was set. -}
|
||||
getFlag :: String -> Annex Bool
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue