]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76ccbda 0106b1d)
Merge branch 'hi/gpg-use-check-signature' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (15:02 -0700)
"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 patch | diff1 | diff2 | blob | history
log-tree.c patch | diff1 | diff2 | blob | history

diff --cc builtin/fmt-merge-msg.c
Simple merge
diff --cc log-tree.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.