diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:51 -0800 |
| commit | 154f22014b6985f9c5935cdf548311828cfcf638 (patch) | |
| tree | 4aab095bf12092c841b997f12d8a663c446f93c1 | |
| parent | d379d464193224efb4de30ccd45f72ab193f8e31 (diff) | |
| parent | 2e285e7803217c56f5e86a0abdec4b7fa8bc1058 (diff) | |
| download | git-154f22014b6985f9c5935cdf548311828cfcf638.tar.gz | |
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
| -rwxr-xr-x | t/lib-gpg.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index f1277bef4f..8d28652b72 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -63,8 +63,7 @@ then 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 |