* [PATCH 1/1] t/lib-gpg.sh: fix GPG keyring import options
@ 2019-03-19 23:15 Dave Huseby
0 siblings, 0 replies; only message in thread
From: Dave Huseby @ 2019-03-19 23:15 UTC (permalink / raw)
To: git; +Cc: gitster
Fix the way GPG keyrings are imported during testing to prevent GPG from
prompting for approval to change the default config. This appears to have no
adverse affects on GPG users with "normal" configurations but fixes the
always-interactive prompting I see with my multi-keyring setup.
Signed-off-by: Dave Huseby <dhuseby@linuxfoundation.org>
---
t/lib-gpg.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 8d28652b72..4f3675f410 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -32,8 +32,8 @@ then
GNUPGHOME="$(pwd)/gpghome" &&
export GNUPGHOME &&
(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
- gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
- "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+ gpg --import-options merge-only --homedir "${GNUPGHOME}" 2>/dev/null \
+ --import "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
--
2.11.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-03-19 23:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-19 23:15 [PATCH 1/1] t/lib-gpg.sh: fix GPG keyring import options Dave Huseby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).