merge/pull Check for untrusted good GPG signatures

Browse Source

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>

...

This commit is contained in:

Sebastian Götte

2013-03-31 18:02:46 +02:00

committed by Junio C Hamano

parent efed002249

commit eb307ae7bb

10 changed files with 29 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

t/lib-gpg/pubring.gpg

Binary file not shown.

BIN

t/lib-gpg/random_seed

Binary file not shown.

BIN

t/lib-gpg/secring.gpg

Binary file not shown.

BIN

t/lib-gpg/trustdb.gpg

Binary file not shown.