From: Todd Zullinger <tmz@pobox.com>
Date: Wed, 3 Jul 2024 15:37:32 +0000 (-0400)
Subject: t/lib-gpg: call prepare_gnupghome() in GPG2 prereq
X-Git-Tag: v2.52.0-rc1~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cd8369ef3;p=thirdparty%2Fgit.git

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>
---

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 &&