[Pkg-gnupg-commit] [gnupg2] 146/160: gpg: Fix regression due to the new --mimemode options.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit 3b8ed7650d2d63b01ec80ecf9e493b80e3ac7ef8
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 13 18:29:40 2016 +0200

    gpg: Fix regression due to the new --mimemode options.
    
    * g10/gpg.c (opts): Re-add oTextmodeShort.
    --
    
    Regression-due-to: e148c3caa90fbadba32bdbfea9513392e3aea598
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/gpg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index 4232a84..539bda5 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -534,8 +534,8 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
 
   ARGPARSE_s_n (oMimemode, "mimemode", "@"),
-  ARGPARSE_s_n (oTextmode,      "textmode", N_("use canonical text mode")),
-  ARGPARSE_s_n (oTextmode,      "textmode", N_("use canonical text mode")),
+  ARGPARSE_s_n (oTextmodeShort, NULL, "@"),
+  ARGPARSE_s_n (oTextmode,   "textmode", N_("use canonical text mode")),
   ARGPARSE_s_n (oNoTextmode, "no-textmode", "@"),
 
   ARGPARSE_s_n (oExpert,      "expert", "@"),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git