]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit3d4eecc87192c78065fb7c2f4ff8c98a33e823ea
treef67ca02a3f4bbc891faf44119722bcb50505805etree | snapshot
parent2df39733e5b07e76ad271c99ff22f5d59a7bf223commit | diff
parent6fb5df6c77070f7cea5391572003ecfea3235650commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.