From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Feb 2019 04:44:50 +0000 (-0800)
Subject: Merge branch 'tz/gpg-test-fix'
X-Git-Tag: v2.21.0-rc1~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=154f22014b6985f9c5935cdf548311828cfcf638;p=thirdparty%2Fgit.git

Merge branch 'tz/gpg-test-fix'

Test fix.

* tz/gpg-test-fix:
  t/lib-gpg: drop redundant killing of gpg-agent
  t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt
---

154f22014b6985f9c5935cdf548311828cfcf638
diff --cc t/lib-gpg.sh
index f1277bef4f,041f10171a..8d28652b72
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@@ -57,14 -57,10 +57,13 @@@ the
  		echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
  			--passphrase-fd 0 --pinentry-mode loopback \
  			--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
 -		gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
 -			| grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
 -			${GNUPGHOME}/trustlist.txt &&
 +
 +		gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
 +		grep fingerprint: |
 +		cut -d" " -f4 |
 +		tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
 +
- 		echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
- 		(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+ 		echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
  		echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
  			-u committer@example.com -o /dev/null --sign - 2>&1 &&
  		test_set_prereq GPGSM