support generic ssh keytypes using a `key::` prefix instead of relying
on ssh- prefixes.
changes since v2:
- no longer hide that we still support `ssh-` prefixes for literal
keys.
Fabian Stelzer (2):
ssh signing: support non ssh-* keytypes
ssh signing: make sign/amend test more resilient
Documentation/config/user.txt | 17 ++++++++++-------
gpg-interface.c | 36 ++++++++++++++++++++++++++++-------
t/lib-gpg.sh | 3 +++
t/t7510-signed-commit.sh | 2 +-
t/t7528-signed-commit-ssh.sh | 26 +++++++++++++++++++++++--
5 files changed, 67 insertions(+), 17 deletions(-)
Range-diff against v2:
1: ea032f98f0 ! 1: 865a32d37c ssh signing: support non ssh-* keytypes
@@ Documentation/config/user.txt: user.signingKey::
+ directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
+ needs to be available via ssh-agent. If not set git will call
+ gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
-+ first key available.
++ first key available. For backward compatibility, a raw key which
++ begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
++ as "key::ssh-rsa XXXXXX identifier", but this form is deprecated;
++ use the `key::` form instead.
## gpg-interface.c ##
@@ gpg-interface.c: int git_gpg_config(const char *var, const char *value, void *cb)
2: 5054ff0e76 = 2: 868cb7f524 ssh signing: make sign/amend test more resilient
base-commit: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc
--
2.31.1
