[git] GnuPG - branch, master, updated. gnupg-2.1.9-104-g6897bbf

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  6897bbf1aa9bf0a61b186ea1a9bcb463fb1fd10e (commit)
      from  de9b2340153d70b083494d1a277a384dcf43bff0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6897bbf1aa9bf0a61b186ea1a9bcb463fb1fd10e
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Nov 4 13:27:49 2015 +0100

    gpg: Print a better error message for --multifile --sign --encrypt.
    
    * g10/gpg.c (main): Print a better error message for --multifile
    --sign --encrypt.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    GnuPG-bug-id: 1009

diff --git a/g10/gpg.c b/g10/gpg.c
index 7338ac9..cdf7b0d 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3503,6 +3503,9 @@ main (int argc, char **argv)
 	  case aSign:
 	    cmdname="--sign";
 	    break;
+	  case aSignEncr:
+	    cmdname="--sign --encrypt";
+	    break;
 	  case aClearsign:
 	    cmdname="--clearsign";
 	    break;

-----------------------------------------------------------------------

Summary of changes:
 g10/gpg.c | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org