]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: efed002) | patch
merge/pull Check for untrusted good GPG signatures
authorSebastian Götte <jaseg@physik.tu-berlin.de>
Sun, 31 Mar 2013 16:02:46 +0000 (18:02 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 05:38:49 +0000 (22:38 -0700)
commiteb307ae7bb78ccde4e2ac69f302ccf8834883628
tree40bed8e400a5208b7c81ff94752133818014da6btree | snapshot
parentefed0022492b81bf59d29193c4ffe96492dd9e9bcommit | diff
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>
Documentation/merge-options.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
commit.c diff | blob | blame | history
commit.h diff | blob | blame | history
gpg-interface.h diff | blob | blame | history
t/lib-gpg/pubring.gpg diff | blob | blame | history
t/lib-gpg/random_seed diff | blob | blame | history
t/lib-gpg/secring.gpg diff | blob | blame | history
t/lib-gpg/trustdb.gpg diff | blob | blame | history
t/t7612-merge-verify-signatures.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.