diff options
Diffstat (limited to 'CmdLine/GitAnnex/Options.hs')
| -rw-r--r-- | CmdLine/GitAnnex/Options.hs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index d762f6a00..51c55b056 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -295,18 +295,26 @@ combiningOptions = shortopt o h = globalFlag (Limit.addToken [o]) ( short o <> help h <> hidden ) jsonOption :: GlobalOption -jsonOption = globalFlag (Annex.setOutput (JSONOutput False)) +jsonOption = globalFlag (Annex.setOutput (JSONOutput jsonoptions)) ( long "json" <> short 'j' <> help "enable JSON output" <> hidden ) + where + jsonoptions = JSONOptions + { jsonProgress = False + } jsonProgressOption :: GlobalOption -jsonProgressOption = globalFlag (Annex.setOutput (JSONOutput True)) +jsonProgressOption = globalFlag (Annex.setOutput (JSONOutput jsonoptions)) ( long "json-progress" <> help "include progress in JSON output" <> hidden ) + where + jsonoptions = JSONOptions + { jsonProgress = True + } -- Note that a command that adds this option should wrap its seek -- action in `allowConcurrentOutput`. |