summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-11-06 07:50:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-07 01:11:09 (GMT)
commitedc4d47d54cb1c0ec1550aa50bba86b23720a72f (patch)
tree446fbde148b7d06c7f628d8da7f81de4b217fe84 /builtin
parentcae598d9980661a978e2df4fb338518f7bf09572 (diff)
downloadgit-edc4d47d54cb1c0ec1550aa50bba86b23720a72f.zip
git-edc4d47d54cb1c0ec1550aa50bba86b23720a72f.tar.gz
git-edc4d47d54cb1c0ec1550aa50bba86b23720a72f.tar.bz2
merge: extract verify_merge_signature() helper
The logic to implement "merge --verify-signatures" is inline in cmd_merge(), but this site misses some cases. Let's extract the logic into a function so we can call it from more places. We'll move it to commit.[ch], since one of the callers (git-pull) is outside our source file. This function isn't all that general (after all, its main function is to exit the program) but it's not worth trying to fix that. The heavy lifting is done by check_commit_signature(), and our purpose here is just sharing the die() logic. We'll mark it with a comment to make that clear. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/merge.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 8f4a506..e1bc5a4 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1355,31 +1355,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (verify_signatures) {
for (p = remoteheads; p; p = p->next) {
- struct commit *commit = p->item;
- char hex[GIT_MAX_HEXSZ + 1];
- struct signature_check signature_check;
- memset(&signature_check, 0, sizeof(signature_check));
-
- check_commit_signature(commit, &signature_check);
-
- find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
- switch (signature_check.result) {
- case 'G':
- 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);
- default: /* 'N' */
- die(_("Commit %s does not have a GPG signature."), hex);
- }
- if (verbosity >= 0 && signature_check.result == 'G')
- printf(_("Commit %s has a good GPG signature by %s\n"),
- hex, signature_check.signer);
-
- signature_check_clear(&signature_check);
+ verify_merge_signature(p->item, verbosity);
}
}