Merge branch 'jk/escaped-wildcard-dwim'

[thirdparty/git.git] / commit.c

diff --git a/commit.c b/commit.c
index 434ec030d6b2a0074c46c376c6322c92fd5c8a39..3f91d3efc5b697933289277606fbd2c053fca795 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1136,21 +1136,23 @@ int check_commit_signature(const struct commit *commit, struct signature_check *
        return ret;
 }
 
-void verify_merge_signature(struct commit *commit, int verbosity)
+void verify_merge_signature(struct commit *commit, int verbosity,
+                           int check_trust)
 {
        char hex[GIT_MAX_HEXSZ + 1];
        struct signature_check signature_check;
+       int ret;
        memset(&signature_check, 0, sizeof(signature_check));
 
-       check_commit_signature(commit, &signature_check);
+       ret = check_commit_signature(commit, &signature_check);
 
        find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
        switch (signature_check.result) {
        case 'G':
+               if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL))
+                       die(_("Commit %s has an untrusted GPG signature, "
+                             "allegedly by %s."), hex, signature_check.signer);
                break;
-       case 'U':
-               die(_("Commit %s has an untrusted GPG signature, "
-                     "allegedly by %s."), hex, signature_check.signer);
        case 'B':
                die(_("Commit %s has a bad GPG signature "
                      "allegedly by %s."), hex, signature_check.signer);