diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/gpg-interface.h | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/gpg-interface.h')
| -rw-r--r-- | third_party/git/gpg-interface.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/third_party/git/gpg-interface.h b/third_party/git/gpg-interface.h index 796571e9e90f..3e624ec289ab 100644 --- a/third_party/git/gpg-interface.h +++ b/third_party/git/gpg-interface.h @@ -7,14 +7,6 @@ struct strbuf; #define GPG_VERIFY_RAW 2 #define GPG_VERIFY_OMIT_STATUS 4 -enum signature_trust_level { - TRUST_UNDEFINED, - TRUST_NEVER, - TRUST_MARGINAL, - TRUST_FULLY, - TRUST_ULTIMATE, -}; - struct signature_check { char *payload; char *gpg_output; @@ -24,6 +16,7 @@ struct signature_check { * possible "result": * 0 (not checked) * N (checked but no further result) + * U (untrusted good) * G (good) * B (bad) */ @@ -32,7 +25,6 @@ struct signature_check { char *key; char *fingerprint; char *primary_key_fingerprint; - enum signature_trust_level trust_level; }; void signature_check_clear(struct signature_check *sigc); |