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

gitster · gitster · commit 891e63140126 · 2023-06-23T11:21:17.000-07:00
Test update.

* tz/lib-gpg-prereq-fix:
  t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
@@ -135,6 +135,7 @@ 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 -n "git" -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
 

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ test_lazy_prereq GPGSSH '`
`135`	`135`	`'`
`136`	`136`
`137`	`137`	`test_lazy_prereq GPGSSH_VERIFYTIME '`
	`138`	`+ test_have_prereq GPGSSH &&`
`138`	`139`	`# Check if ssh-keygen has a verify-time option by passing an invalid date to it`
`139`	`140`	`ssh-keygen -Overify-time=INVALID -Y check-novalidate -n "git" -s doesnotmatter 2>&1 \| grep -q -F "Invalid \"verify-time\"" &&`
`140`	`141`