From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Nov 2025 15:48:07 +0000 (-0800)
Subject: Merge branch 'tz/test-prepare-gnupghome'
X-Git-Tag: v2.52.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f0d663eace8c6797441c60220abec16b40e9a2b;p=thirdparty%2Fgit.git

Merge branch 'tz/test-prepare-gnupghome'

Tests did not set up GNUPGHOME correctly, which is fixed but some
flaky tests are exposed in t1016, which needs to be addressed
before this topic can move forward.

* tz/test-prepare-gnupghome:
  t/lib-gpg: call prepare_gnupghome() in GPG2 prereq
  t/lib-gpg: add prepare_gnupghome() to create GNUPGHOME dir
---

8f0d663eace8c6797441c60220abec16b40e9a2b
diff --cc t/lib-gpg.sh
index b99ae39a06,21666b2ab0..97268ae07c
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@@ -71,15 -66,8 +71,16 @@@ test_lazy_prereq GPG2 
  		exit 1
  		;;
  	*)
+ 		prepare_gnupghome &&
  		(gpgconf --kill all || : ) &&
 +
 +		# NEEDSWORK: prepare_gnupghome() should definitely be
 +		# called here, but it looks like it exposes a
 +		# pre-existing, hidden bug by allowing some tests in
 +		# t1016-compatObjectFormat.sh to run instead of being
 +		# skipped. See:
 +		# https://lore.kernel.org/git/ZoV8b2RvYxLOotSJ@teonanacatl.net/
 +
  		gpg --homedir "${GNUPGHOME}" --import \
  			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
  		gpg --homedir "${GNUPGHOME}" --import-ownertrust \