mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix find --json to output json once more.

Browse source 
Reversion from commit 436f10771, CustomOutput was forcing quiet output
which overrode the json setting.

find happened to be the only command that uses CustomOutput and also
outputs json. (metadata --get does also use CustomOutput and --json does not
enable json output for that, which may be an oversight, but was already the
behavior before this regression.)
This commit is contained in:
Joey Hess 2019-07-05 09:58:37 -04:00
parent 8f26422943
commit b8ef1bf3be
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG
View file

@ -1,3 +1,9 @@
git-annex (7.20190627) UNRELEASED; urgency=medium
* Fix find --json to output json once more.
-- Joey Hess <id@joeyh.name> Fri, 05 Jul 2019 09:49:52 -0400
git-annex (7.20190626) upstream; urgency=medium git-annex (7.20190626) upstream; urgency=medium
* get, move, copy, sync: When -J or annex.jobs has enabled concurrency, * get, move, copy, sync: When -J or annex.jobs has enabled concurrency,

5
Messages.hs
View file

@ -99,7 +99,10 @@ showStartMessage (StartUsualMessages command ai) = do
_ -> noop _ -> noop
showStartMessage (StartMessage command ai) showStartMessage (StartMessage command ai)
showStartMessage (StartNoMessage _) = noop showStartMessage (StartNoMessage _) = noop
showStartMessage (CustomOutput _) = Annex.setOutput QuietOutput showStartMessage (CustomOutput _) =
outputType <$> Annex.getState Annex.output >>= \case
NormalOutput -> Annex.setOutput QuietOutput
_ -> noop
-- Only show end result if the StartMessage is one that gets displayed. -- Only show end result if the StartMessage is one that gets displayed.
showEndMessage :: StartMessage -> Bool -> Annex () showEndMessage :: StartMessage -> Bool -> Annex ()

2
doc/bugs/Regression_in___96__find_--json__96___output.mdwn
View file

@ -30,3 +30,5 @@ show similar issues and `find` is just the first I noticed.
GNU/Linux, building git-annex with Guix GNU/Linux, building git-annex with Guix
[[!meta author=kyle]] [[!meta author=kyle]]
> [[fixed|done]] --[[Joey]]