From: "Sebastian Götte" <jaseg@physik.tu-berlin.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v2 0/4] Verify GPG signatures when merging and extend %G? pretty string
Date: Sat, 23 Mar 2013 02:57:37 +0100 [thread overview]
Message-ID: <514D0C11.1080905@physik.tu-berlin.de> (raw)
As suggested by Junio I split the preivous patch into four parts.
Sebastian Götte (4):
Move commit GPG signature verification to commit.c
merge/pull: verify GPG signatures of commits being merged
merge/pull Check for untrusted good GPG signatures
pretty printing: extend %G? to include 'N' and 'U'
Documentation/merge-options.txt | 4 +++
Documentation/pretty-formats.txt | 3 +-
builtin/merge.c | 33 +++++++++++++++++-
commit.c | 55 +++++++++++++++++++++++++++++
commit.h | 9 +++++
git-pull.sh | 10 ++++--
gpg-interface.h | 6 ++++
pretty.c | 69 ++++---------------------------------
t/lib-gpg/pubring.gpg | Bin 1164 -> 2359 bytes
t/lib-gpg/random_seed | Bin 600 -> 600 bytes
t/lib-gpg/secring.gpg | Bin 1237 -> 3734 bytes
t/lib-gpg/trustdb.gpg | Bin 1280 -> 1360 bytes
t/t7612-merge-verify-signatures.sh | 61 ++++++++++++++++++++++++++++++++
13 files changed, 184 insertions(+), 66 deletions(-)
create mode 100755 t/t7612-merge-verify-signatures.sh
--
1.8.1.5
reply other threads:[~2013-03-23 1:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=514D0C11.1080905@physik.tu-berlin.de \
--to=jaseg@physik.tu-berlin.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).