]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'fs/ssh-signing'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:58 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:58 +0000 (16:06 -0700)
Use ssh public crypto for object and push-cert signing.

* fs/ssh-signing:
  ssh signing: test that gpg fails for unknown keys
  ssh signing: tests for logs, tags & push certs
  ssh signing: duplicate t7510 tests for commits
  ssh signing: verify signatures using ssh-keygen
  ssh signing: provide a textual signing_key_id
  ssh signing: retrieve a default key from ssh-agent
  ssh signing: add ssh key format and signing code
  ssh signing: add test prereqs
  ssh signing: preliminary refactoring and clean-up

1  2 
builtin/receive-pack.c
fmt-merge-msg.c
log-tree.c
pretty.c
send-pack.c
t/t4202-log.sh

Simple merge
diff --cc fmt-merge-msg.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc pretty.c
Simple merge
diff --cc send-pack.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge