summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorSebastian Götte <jaseg@physik.tu-berlin.de>2013-03-31 18:02:46 +0200
committerJunio C Hamano <gitster@pobox.com>2013-03-31 22:38:49 -0700
commiteb307ae7bb78ccde4e2ac69f302ccf8834883628 (patch)
tree40bed8e400a5208b7c81ff94752133818014da6b /commit.h
parentefed0022492b81bf59d29193c4ffe96492dd9e9b (diff)
downloadgit-eb307ae7bb78ccde4e2ac69f302ccf8834883628.tar.gz
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 'commit.h')
-rw-r--r--commit.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/commit.h b/commit.h
index c24b844ad6..87b4b6cc0c 100644
--- a/commit.h
+++ b/commit.h
@@ -234,11 +234,11 @@ extern void print_commit_list(struct commit_list *list,
const char *format_last);
/*
- * Check the signature of the given commit. The result of the check is stored in
- * sig->result, 'G' for a good signature, 'B' for a bad signature and 'N'
- * for no signature at all.
- * This may allocate memory for sig->gpg_output, sig->gpg_status, sig->signer
- * and sig->key.
+ * Check the signature of the given commit. The result of the check is stored
+ * in sig->check_result, 'G' for a good signature, 'U' for a good signature
+ * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
+ * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
+ * sig->signer and sig->key.
*/
extern void check_commit_signature(const struct commit* commit, struct signature_check *sigc);