aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2024-07-03 11:37:32 -0400
committerJunio C Hamano <gitster@pobox.com>2025-10-09 17:58:35 -0700
commit6cd8369ef394176978b962edd8676d74ecd1c400 (patch)
tree570bc82e7a014c67bbcf1c432f33e0703031b755
parenta35952b493f24941ad47233ac01ac9fea305d07f (diff)
downloadgit-6cd8369ef394176978b962edd8676d74ecd1c400.tar.xz
t/lib-gpg: call prepare_gnupghome() in GPG2 prereq
The GPG2 prereq added in 2f36339fa8 (t/lib-gpg: introduce new prereq GPG2, 2023-06-04) does not create the $GNUPGHOME directory. Tests which use the GPG2 prereq without previously using the GPG prereq fail because of the missing directory. This currently affects t1016-compatObjectFormat. Ensure $GNUPGHOME is created in the GPG2 prereq. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-gpg.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 4e44f182bb..21666b2ab0 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -66,6 +66,7 @@ test_lazy_prereq GPG2 '
exit 1
;;
*)
+ prepare_gnupghome &&
(gpgconf --kill all || : ) &&
gpg --homedir "${GNUPGHOME}" --import \
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&