diff options
author | Justus Winter <[email protected]> | 2016-12-15 13:50:10 +0000 |
---|---|---|
committer | Justus Winter <[email protected]> | 2016-12-15 13:50:10 +0000 |
commit | 6e4396723e9e5865015ebf7033628fa3919cf7d1 (patch) | |
tree | df65305bb7e3f846cc7ea4af7e3e112e0ac834ab /g10/gpg.c | |
parent | g10: Spell out --desig-revoke. (diff) | |
download | gnupg-6e4396723e9e5865015ebf7033628fa3919cf7d1.tar.gz gnupg-6e4396723e9e5865015ebf7033628fa3919cf7d1.zip |
g10: Rename 'card-edit' to 'edit-card'.
* g10/gpg.c (opts): Rename option.
* g10/call-agent.c (agent_scd_learn): Update comment.
* doc/gpg.texi: Update accordingly.
--
This change has a surprising side effect. Previously, --edit was an
alias for --edit-key, because the argument parser actually accepts
unique prefixes of all options. With this change, however, --edit is
ambiguous.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | g10/gpg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -495,7 +495,8 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_c (aFastImport, "fast-import", "@"), #ifdef ENABLE_CARD_SUPPORT ARGPARSE_c (aCardStatus, "card-status", N_("print the card status")), - ARGPARSE_c (aCardEdit, "card-edit", N_("change data on a card")), + ARGPARSE_c (aCardEdit, "edit-card", N_("change data on a card")), + ARGPARSE_c (aCardEdit, "card-edit", "@"), ARGPARSE_c (aChangePIN, "change-pin", N_("change a card's PIN")), #endif ARGPARSE_c (aListConfig, "list-config", "@"), |