diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:28:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:28:17 -0800 |
| commit | 3d4eecc87192c78065fb7c2f4ff8c98a33e823ea (patch) | |
| tree | f67ca02a3f4bbc891faf44119722bcb50505805e /git-am.sh | |
| parent | Merge branch 'jk/commit-date-approxidate' (diff) | |
| parent | tests: make comment on GPG keyring match the code (diff) | |
| download | tgif-3d4eecc87192c78065fb7c2f4ff8c98a33e823ea.tar.xz | |
Merge branch 'ch/new-gpg-drops-rfc-1991'
Recent GPG changes the keyring format and drops support for RFC1991
formatted signatures, breaking our existing tests.
* ch/new-gpg-drops-rfc-1991:
tests: make comment on GPG keyring match the code
tests: squelch noise from GPG machinery set-up
tests: replace binary GPG keyrings with ASCII-armored keys
tests: skip RFC1991 tests for gnupg 2.1
tests: create gpg homedir on the fly
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions