mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Change armor Version header to emit only the major version.
* g10/options.h (opt): Rename field no_version to emit_version.
* g10/gpg.c (main): Init opt.emit_vesion to 1. Change --emit-version
to bump up opt.emit_version.
* g10/armor.c (armor_filter): Implement different --emit-version
values.
--
GnuPG-bug-id: 1572
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e951782e93
)
Resolved conflicts:
NEWS
g10/armor.c
g10/gpg.c
This commit is contained in:
parent
571bcd4662
commit
fd5f452496
5 changed files with 49 additions and 22 deletions
|
@ -2408,8 +2408,12 @@ protected by the signature.
|
|||
@item --emit-version
|
||||
@itemx --no-emit-version
|
||||
@opindex emit-version
|
||||
Force inclusion of the version string in ASCII armored output.
|
||||
@option{--no-emit-version} disables this option.
|
||||
Force inclusion of the version string in ASCII armored output. If
|
||||
given once only the name of the program and the major number is
|
||||
emitted (default), given twice the minor is also emitted, given triple
|
||||
the micro is added, and given quad an operating system identification
|
||||
is also emitted. @option{--no-emit-version} disables the version
|
||||
line.
|
||||
|
||||
@item --sig-notation @code{name=value}
|
||||
@itemx --cert-notation @code{name=value}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue