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 /Documentation/git-merge-base.txt | |
| parent | Prepare for 2.14.2 (diff) | |
| parent | t: lib-gpg: flush gpg agent on startup (diff) | |
| download | tgif-638eb4e70189fd13ad9a44c514bb16dbcdf829a7.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions