From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Apr 2023 23:03:03 +0000 (-0700)
Subject: Merge branch 'jk/gpg-trust-level-fix'
X-Git-Tag: v2.41.0-rc0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aabc69885e5d9abeda8d9efd487c16d4b4cfa7e4;p=thirdparty%2Fgit.git

Merge branch 'jk/gpg-trust-level-fix'

The "%GT" placeholder for the "--format" option of "git log" and
friends caused BUG() to trigger on a commit signed with an unknown
key, which has been corrected.

* jk/gpg-trust-level-fix:
  gpg-interface: set trust level of missing key to "undefined"
---

aabc69885e5d9abeda8d9efd487c16d4b4cfa7e4
diff --cc gpg-interface.c
index aceeb08336,b8ad682174..f3ac5acdd9
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@@ -647,10 -632,8 +647,10 @@@ int check_signature(struct signature_ch
  	struct gpg_format *fmt;
  	int status;
  
 +	gpg_interface_lazy_init();
 +
  	sigc->result = 'N';
- 	sigc->trust_level = -1;
+ 	sigc->trust_level = TRUST_UNDEFINED;
  
  	fmt = get_format_by_sig(signature);
  	if (!fmt)