]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
"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"

1  2 
builtin/fmt-merge-msg.c
gpg-interface.c
gpg-interface.h
log-tree.c

Simple merge
diff --cc gpg-interface.c
Simple merge
diff --cc gpg-interface.h
Simple merge
diff --cc log-tree.c
Simple merge