merge/pull Check for untrusted good GPG signatures
commiteb307ae7bb78ccde4e2ac69f302ccf8834883628
authorSebastian Götte <jaseg@physik.tu-berlin.de>
Sun, 31 Mar 2013 16:02:46 +0000 (31 18:02 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 05:38:49 +0000 (31 22:38 -0700)
tree40bed8e400a5208b7c81ff94752133818014da6b
parentefed0022492b81bf59d29193c4ffe96492dd9e9b
merge/pull Check for untrusted good GPG signatures

When --verify-signatures is specified, abort the merge in case a good
GPG signature from an untrusted key is encountered.

Signed-off-by: Sebastian Götte <jaseg@physik-pool.tu-berlin.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-options.txt
builtin/merge.c
commit.c
commit.h
gpg-interface.h
t/lib-gpg/pubring.gpg
t/lib-gpg/random_seed
t/lib-gpg/secring.gpg
t/lib-gpg/trustdb.gpg
t/t7612-merge-verify-signatures.sh