tag.c: implement '--merged' and '--no-merged' options

diff --git a/gpg-interface.c b/gpg-interface.c
index e764fb625ba251c83eb425221bbc5b3a03ac3f56..3dc2fe397e32d79713780596f0ef4666c14b5955 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -87,11 +87,14 @@ int check_signature(const char *payload, size_t plen, const char *signature,
 
 void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
 {
+       const char *output = flags & GPG_VERIFY_RAW ?
+               sigc->gpg_status : sigc->gpg_output;
+
        if (flags & GPG_VERIFY_VERBOSE && sigc->payload)
                fputs(sigc->payload, stdout);
 
-       if (sigc->gpg_output)
-               fputs(sigc->gpg_output, stderr);
+       if (output)
+               fputs(output, stderr);
 }
 
 /*