diff options
| author | Sebastian Götte <jaseg@physik.tu-berlin.de> | 2013-03-31 20:02:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:38:49 +0400 |
| commit | eb307ae7bb78ccde4e2ac69f302ccf8834883628 (patch) | |
| tree | 40bed8e400a5208b7c81ff94752133818014da6b /t/lib-gpg | |
| parent | efed0022492b81bf59d29193c4ffe96492dd9e9b (diff) | |
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>
Diffstat (limited to 't/lib-gpg')
| -rw-r--r-- | t/lib-gpg/pubring.gpg | bin | 1164 -> 2359 bytes |
| -rw-r--r-- | t/lib-gpg/random_seed | bin | 600 -> 600 bytes |
| -rw-r--r-- | t/lib-gpg/secring.gpg | bin | 1237 -> 3734 bytes |
| -rw-r--r-- | t/lib-gpg/trustdb.gpg | bin | 1280 -> 1360 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/t/lib-gpg/pubring.gpg b/t/lib-gpg/pubring.gpg Binary files differindex 83855fa4e1..1a3c2d487c 100644 --- a/t/lib-gpg/pubring.gpg +++ b/t/lib-gpg/pubring.gpg diff --git a/t/lib-gpg/random_seed b/t/lib-gpg/random_seed Binary files differindex 8fed1339ed..95d249f15f 100644 --- a/t/lib-gpg/random_seed +++ b/t/lib-gpg/random_seed diff --git a/t/lib-gpg/secring.gpg b/t/lib-gpg/secring.gpg Binary files differindex d831cd9eb3..82dca8f80b 100644 --- a/t/lib-gpg/secring.gpg +++ b/t/lib-gpg/secring.gpg diff --git a/t/lib-gpg/trustdb.gpg b/t/lib-gpg/trustdb.gpg Binary files differindex abace962b8..4879ae9a84 100644 --- a/t/lib-gpg/trustdb.gpg +++ b/t/lib-gpg/trustdb.gpg |