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.

1 files changed, 2 insertions, 1 deletions

diff --git a/Annex.hs b/Annex.hs
index 4ab700332..7b4bb706c 100644
--- a/Annex.hs
+++ b/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