diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:00 -0700 |
| commit | a6f1456380f114e26d68771d9316c57ab468b8fe (patch) | |
| tree | 9379ecdc25cb4e5c6bfebe9eafa5e56e85e0b460 | |
| parent | Merge branch 'rs/pack-objects-pbase-cleanup' (diff) | |
| parent | t: lib-gpg: flush gpg agent on startup (diff) | |
| download | tgif-a6f1456380f114e26d68771d9316c57ab468b8fe.tar.xz | |
Merge branch 'st/lib-gpg-kill-stray-agent'
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 \ |