diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:48 +0900 |
| commit | 638eb4e70189fd13ad9a44c514bb16dbcdf829a7 (patch) | |
| tree | 5e90537279ae1b06dfe138f4b0ef027f365f681d | |
| parent | edc74bc7f0c6884027e851ef09b2e0c9380dcd45 (diff) | |
| parent | 29ff1f8f7493ecd5b90521adff6ed523d61ec73f (diff) | |
| download | git-638eb4e70189fd13ad9a44c514bb16dbcdf829a7.tar.gz | |
Merge branch 'st/lib-gpg-kill-stray-agent' into maint
Some versions of GnuPG fails to kill gpg-agent it auto-spawned
and such a left-over agent can interfere with a test. Work it
around by attempting to kill one before starting a new test.
* st/lib-gpg-kill-stray-agent:
t: lib-gpg: flush gpg agent on startup
| -rwxr-xr-x | t/lib-gpg.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index ec2aa8f687..43679a4c64 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -31,6 +31,7 @@ then chmod 0700 ./gpghome && GNUPGHOME="$(pwd)/gpghome" && export GNUPGHOME && + (gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) && gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \ "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \ |