As suggested by Junio I split the preivous patch into four parts. Sebastian Götte (4): Move commit GPG signature verification to commit.c merge/pull: verify GPG signatures of commits being merged merge/pull Check for untrusted good GPG signatures pretty printing: extend %G? to include 'N' and 'U'
Documentation/merge-options.txt | 4 +++ Documentation/pretty-formats.txt | 3 +- builtin/merge.c | 33 +++++++++++++++++- commit.c | 55 +++++++++++++++++++++++++++++ commit.h | 9 +++++ git-pull.sh | 10 ++++-- gpg-interface.h | 6 ++++ pretty.c | 69 ++++--------------------------------- t/lib-gpg/pubring.gpg | Bin 1164 -> 2359 bytes t/lib-gpg/random_seed | Bin 600 -> 600 bytes t/lib-gpg/secring.gpg | Bin 1237 -> 3734 bytes t/lib-gpg/trustdb.gpg | Bin 1280 -> 1360 bytes t/t7612-merge-verify-signatures.sh | 61 ++++++++++++++++++++++++++++++++ 13 files changed, 184 insertions(+), 66 deletions(-) create mode 100755 t/t7612-merge-verify-signatures.sh -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
