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 /builtin/merge-tree.c | |
| 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
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions