diff options
| author | Sebastian Götte <jaseg@physik.tu-berlin.de> | 2013-03-31 18:02:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-31 22:38:49 -0700 |
| commit | eb307ae7bb78ccde4e2ac69f302ccf8834883628 (patch) | |
| tree | 40bed8e400a5208b7c81ff94752133818014da6b /gpg-interface.h | |
| parent | efed0022492b81bf59d29193c4ffe96492dd9e9b (diff) | |
| download | git-eb307ae7bb78ccde4e2ac69f302ccf8834883628.tar.gz git-eb307ae7bb78ccde4e2ac69f302ccf8834883628.tar.xz | |
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 'gpg-interface.h')
| -rw-r--r-- | gpg-interface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gpg-interface.h b/gpg-interface.h index 5884aa405..a85cb5bc9 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -6,6 +6,7 @@ struct signature_check { char *gpg_status; char result; /* 0 (not checked), * N (checked but no further result), + * U (untrusted good), * G (good) * B (bad) */ char *signer; |