summaryrefslogtreecommitdiff
path: root/Documentation/config/user.txt
diff options
context:
space:
mode:
authorLibravatar Fabian Stelzer <fs@gigacodes.de>2021-09-10 20:07:36 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-10 14:15:51 -0700
commit29b315778e958417a411f02b6d4b5a0fc9d731e2 (patch)
tree647bc9f83957790eed589a177511ebc6bafdb0c5 /Documentation/config/user.txt
parentssh signing: add test prereqs (diff)
downloadtgif-29b315778e958417a411f02b6d4b5a0fc9d731e2.tar.xz
ssh signing: add ssh key format and signing code
Implements the actual sign_buffer_ssh operation and move some shared cleanup code into a strbuf function Set gpg.format = ssh and user.signingkey to either a ssh public key string (like from an authorized_keys file), or a ssh key file. If the key file or the config value itself contains only a public key then the private key needs to be available via ssh-agent. gpg.ssh.program can be set to an alternative location of ssh-keygen. A somewhat recent openssh version (8.2p1+) of ssh-keygen is needed for this feature. Since only ssh-keygen is needed it can this way be installed seperately without upgrading your system openssh packages. Signed-off-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/user.txt')
-rw-r--r--Documentation/config/user.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index 59aec7c3ae..2155128957 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -36,3 +36,8 @@ user.signingKey::
commit, you can override the default selection with this variable.
This option is passed unchanged to gpg's --local-user parameter,
so you may specify a key using any method that gpg supports.
+ If gpg.format is set to "ssh" this can contain the literal ssh public
+ key (e.g.: "ssh-rsa XXXXXX identifier") or a file which contains it and
+ corresponds to the private key used for signing. The private key
+ needs to be available via ssh-agent. Alternatively it can be set to
+ a file containing a private key directly.