From: santiago@nyu.edu
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, sunshine@sunshineco.com,
walters@verbum.org, Lukas Puehringer <luk.puehringer@gmail.com>
Subject: [PATCH v6 1/6] gpg-interface,tag: add GPG_VERIFY_OMIT_STATUS flag
Date: Tue, 17 Jan 2017 18:37:18 -0500 [thread overview]
Message-ID: <20170117233723.23897-2-santiago@nyu.edu> (raw)
In-Reply-To: <20170117233723.23897-1-santiago@nyu.edu>
From: Lukas Puehringer <luk.puehringer@gmail.com>
Functions that print git object information may require that the
gpg-interface functions be silent. Add GPG_VERIFY_OMIT_STATUS flag and
prevent print_signature_buffer from being called if flag is set.
Signed-off-by: Lukas Puehringer <luk.puehringer@gmail.com>
---
gpg-interface.h | 5 +++--
tag.c | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gpg-interface.h b/gpg-interface.h
index ea68885ad..d2d4fd3a6 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -1,8 +1,9 @@
#ifndef GPG_INTERFACE_H
#define GPG_INTERFACE_H
-#define GPG_VERIFY_VERBOSE 1
-#define GPG_VERIFY_RAW 2
+#define GPG_VERIFY_VERBOSE 1
+#define GPG_VERIFY_RAW 2
+#define GPG_VERIFY_OMIT_STATUS 4
struct signature_check {
char *payload;
diff --git a/tag.c b/tag.c
index d1dcd18cd..243d1fdbb 100644
--- a/tag.c
+++ b/tag.c
@@ -3,6 +3,7 @@
#include "commit.h"
#include "tree.h"
#include "blob.h"
+#include "gpg-interface.h"
const char *tag_type = "tag";
@@ -24,7 +25,9 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
ret = check_signature(buf, payload_size, buf + payload_size,
size - payload_size, &sigc);
- print_signature_buffer(&sigc, flags);
+
+ if (!(flags & GPG_VERIFY_OMIT_STATUS))
+ print_signature_buffer(&sigc, flags);
signature_check_clear(&sigc);
return ret;
--
2.11.0
next prev parent reply other threads:[~2017-01-17 23:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 23:37 [PATCH v6 0/6] Add --format to tag verification santiago
2017-01-17 23:37 ` santiago [this message]
2017-01-17 23:37 ` [PATCH v6 2/6] ref-filter: add function to print single ref_array_item santiago
2017-01-17 23:37 ` [PATCH v6 3/6] builtin/verify-tag: add --format to verify-tag santiago
2017-01-17 23:37 ` [PATCH v6 4/6] builtin/tag: add --format argument for tag -v santiago
2017-01-18 0:02 ` Junio C Hamano
2017-01-18 0:05 ` Junio C Hamano
2017-01-18 0:19 ` Junio C Hamano
2017-01-18 18:25 ` Junio C Hamano
2017-01-18 18:28 ` Santiago Torres
2017-01-18 18:44 ` Junio C Hamano
2017-01-18 18:50 ` Santiago Torres
2017-01-18 20:16 ` Eric Wong
2017-01-19 0:37 ` Eric Wong
2017-01-18 18:52 ` Junio C Hamano
2017-01-18 18:28 ` Jeff King
2017-01-18 18:49 ` Junio C Hamano
2017-01-17 23:37 ` [PATCH v6 5/6] t/t7030-verify-tag: Add --format specifier tests santiago
2017-01-17 23:37 ` [PATCH v6 6/6] t/t7004-tag: " santiago
2017-01-18 0:07 ` [PATCH v6 0/6] Add --format to tag verification Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170117233723.23897-2-santiago@nyu.edu \
--to=santiago@nyu.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=luk.puehringer@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=walters@verbum.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).