From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Jun 2023 18:21:16 +0000 (-0700)
Subject: Merge branch 'tz/lib-gpg-prereq-fix'
X-Git-Tag: v2.42.0-rc0~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891e631401268ba513d903e0646c2967d629a8d9;p=thirdparty%2Fgit.git

Merge branch 'tz/lib-gpg-prereq-fix'

Test update.

* tz/lib-gpg-prereq-fix:
  t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
---

891e631401268ba513d903e0646c2967d629a8d9
diff --cc t/lib-gpg.sh
index 28652ed91f,db63aeb6ed..739e6ec35c
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@@ -135,8 -135,9 +135,9 @@@ test_lazy_prereq GPGSSH 
  '
  
  test_lazy_prereq GPGSSH_VERIFYTIME '
+ 	test_have_prereq GPGSSH &&
  	# Check if ssh-keygen has a verify-time option by passing an invalid date to it
 -	ssh-keygen -Overify-time=INVALID -Y check-novalidate -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
 +	ssh-keygen -Overify-time=INVALID -Y check-novalidate -n "git" -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
  
  	# Set up keys with key lifetimes
  	ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&