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

Remove -j short option for --json-progress; that option was already taken for --json.

Browse source 
This commit was sponsored by Trenton Cronholm.
This commit is contained in:
Joey Hess 2017-01-30 12:46:42 -04:00
parent ab867a7af9
commit 280442ca2c
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -3,6 +3,8 @@ git-annex (6.20170102) UNRELEASED; urgency=medium
* Increase default cost for p2p remotes from 200 to 1000. * Increase default cost for p2p remotes from 200 to 1000.
This makes git-annex prefer transferring data from special This makes git-annex prefer transferring data from special
remotes when possible. remotes when possible.
* Remove -j short option for --json-progress; that option was already
taken for --json.
-- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400 -- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400

2
CmdLine/GitAnnex/Options.hs
View file

@ -294,7 +294,7 @@ jsonOption = globalFlag (Annex.setOutput (JSONOutput False))
jsonProgressOption :: GlobalOption jsonProgressOption :: GlobalOption
jsonProgressOption = globalFlag (Annex.setOutput (JSONOutput True)) jsonProgressOption = globalFlag (Annex.setOutput (JSONOutput True))
( long "json-progress" <> short 'j' ( long "json-progress"
<> help "include progress in JSON output" <> help "include progress in JSON output"
<> hidden <> hidden
) )

3
doc/bugs/clash_of_-j__in_copy_for_--json_--json-progress.mdwn
View file

@ -13,3 +13,6 @@ $> git annex copy --help
"""]] """]]
[[!meta author=yoh]] [[!meta author=yoh]]
> Removed the short -j for --json-progress, I don't think that
> needs a short option. [[done]] --[[Joey]]