summaryrefslogtreecommitdiff
path: root/iterator.h
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 /iterator.h
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 'iterator.h')
0 files changed, 0 insertions, 0 deletions