Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-06-21 01:53:11 +0300
committerJunio C Hamano <gitster@pobox.com>2023-06-21 01:53:11 +0300
commit40693ae926d8c69f1c1812de74698b6980fb360e (patch)
tree342072b878053c1ab23aaa7d96d1f3ce1819a183
parent056d16406d073cb512a32c64091b1931d1d694c9 (diff)
parent20025fdfc756821ee51cc4955108cbfb519e1d68 (diff)
Merge branch 'tz/test-ssh-verifytime-fix'
Test fix. * tz/test-ssh-verifytime-fix: t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
-rw-r--r--t/lib-gpg.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 114785586a..28652ed91f 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -136,7 +136,7 @@ test_lazy_prereq GPGSSH '
test_lazy_prereq GPGSSH_VERIFYTIME '
# 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 &&