Merge branch 'st/lib-gpg-kill-stray-agent' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:02:48 +0000 (17:02 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:02:48 +0000 (17:02 +0900)
commit638eb4e70189fd13ad9a44c514bb16dbcdf829a7
tree5e90537279ae1b06dfe138f4b0ef027f365f681d
parentedc74bc7f0c6884027e851ef09b2e0c9380dcd45
parent29ff1f8f7493ecd5b90521adff6ed523d61ec73f
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