2 commits

Author	SHA1	Message	Date
Sebastian Götte	eb307ae7bb	merge/pull Check for untrusted good GPG signatures ... When --verify-signatures is specified, abort the merge in case a good GPG signature from an untrusted key is encountered. Signed-off-by: Sebastian Götte <jaseg@physik-pool.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2013-03-31 22:38:49 -07:00
Jeff King	37d3e85912	t7004: factor out gpg setup ... Other test scripts may want to look at or verify signed tags, and the setup is non-trivial. Let's factor this out into lib-gpg.sh for other tests to use. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2011-09-08 13:50:58 -07:00