From eb307ae7bb78ccde4e2ac69f302ccf8834883628 Mon Sep 17 00:00:00 2001
From: Sebastian Götte <jaseg@physik.tu-berlin.de>
Date: Sun, 31 Mar 2013 18:02:46 +0200
Subject: merge/pull Check for untrusted good GPG signatures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 gpg-interface.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gpg-interface.h')

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;
-- 
cgit v1.2.3