Merge branch 'hi/gpg-use-check-signature'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:05 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:05 +0000 (10:43 -0800)
commite63cefb024895fcff4b692cad84cb33ac4c81dcc
tree75658b419b1a097b7bdce369262361323e6c8b7e
parent5da7329e29db93a93099bfee2a81171392341ac8
parent0106b1d4be166fd4f7bcf0b901d50940c9f539e2
Merge branch 'hi/gpg-use-check-signature'

"git merge signed-tag" while lacking the public key started to say
"No signature", which was utterly wrong.  This regression has been
reverted.

* hi/gpg-use-check-signature:
  Revert "gpg-interface: prefer check_signature() for GPG verification"
builtin/fmt-merge-msg.c
gpg-interface.c
gpg-interface.h
log-tree.c