]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2df3973 6fb5df6)
Merge branch 'ch/new-gpg-drops-rfc-1991'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:16 +0000 (12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:28:17 +0000 (12:28 -0800)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.