]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tz/lib-gpg-prereq-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2023 18:21:16 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2023 18:21:17 +0000 (11:21 -0700)
Test update.

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

1  2 
t/lib-gpg.sh

diff --cc t/lib-gpg.sh
index 28652ed91fb3137cf614a8b7f184565b06a3d87f,db63aeb6ed63073619e929bae5efaca70bb94bb4..739e6ec35c11815d1969ac17001699cf72553fe7
@@@ -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 &&