diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-09 21:19:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-09 21:19:06 (GMT) |
| commit | 92dd0a55d0f8b5c8a35425309006a4b982a4d69e (patch) | |
| tree | 56b6b43ea9475c865305efcd4d8262b268e61aa2 /t | |
| parent | 88d915a634b449147855041d44875322de2b286d (diff) | |
| parent | 7140c4988fba56367f07674f658bc56bbc8e593c (diff) | |
| download | git-92dd0a55d0f8b5c8a35425309006a4b982a4d69e.zip git-92dd0a55d0f8b5c8a35425309006a4b982a4d69e.tar.gz git-92dd0a55d0f8b5c8a35425309006a4b982a4d69e.tar.bz2 | |
Merge branch 'ad/ssh-signing-testfix'
Fix ssh-signing test to work on a platform where the default ACL is
overly loose to upset OpenSSH (reported on an installation of Cygwin).
* ad/ssh-signing-testfix:
t/lib-git.sh: fix ACL-related permissions failure
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-gpg.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index f99ef3e..1d8e5b5 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -106,6 +106,7 @@ test_lazy_prereq GPGSSH ' test $? = 0 || exit 1; mkdir -p "${GNUPGHOME}" && chmod 0700 "${GNUPGHOME}" && + (setfacl -k "${GNUPGHOME}" 2>/dev/null || true) && ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null && echo "\"principal with number 1\" $(cat "${GPGSSH_KEY_PRIMARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" && ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null && |