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:
authorTodd Zullinger <tmz@pobox.com>2023-05-25 06:10:24 +0300
committerJunio C Hamano <gitster@pobox.com>2023-05-26 07:37:08 +0300
commit20025fdfc756821ee51cc4955108cbfb519e1d68 (patch)
tree3854767b9a02b718412bcb3f2bad54295f0247d5 /t/lib-gpg.sh
parent79bdd48716a4c455bdc8ffd91d57a18d5cd55baa (diff)
t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
OpenSSH-9.0 requires a namespace option with `-Y check-novalidate`. This was added in openssh-portable commit a0b5816f8 (upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV, 2022-03-18). The -n option was documented as a required option since check-novalidate was added in openssh-portable 8aa2aa3cd (upstream: Allow testing signature syntax and validity without verifying, 2019-09-16). Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-gpg.sh')
-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 &&