summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Fabian Stelzer <fs@gigacodes.de>2021-11-19 16:07:06 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-19 09:05:25 -0800
commit350a2518c8ea4f42934b4d6f3466d2815efff97f (patch)
tree2d16edddbdec7676643793a024c40f5338ebf756 /Documentation/merge-options.txt
parentGit 2.34 (diff)
downloadtgif-350a2518c8ea4f42934b4d6f3466d2815efff97f.tar.xz
ssh signing: support non ssh-* keytypes
The user.signingKey config for ssh signing supports either a path to a file containing the key or for the sake of convenience a literal string with the ssh public key. To differentiate between those two cases we check if the first few characters contain "ssh-" which is unlikely to be the start of a path. ssh supports other key types which are not prefixed with "ssh-" and will currently be treated as a file path and therefore fail to load. To remedy this we move the prefix check into its own function and introduce the prefix `key::` for literal ssh keys. This way we don't need to add new key types when they become available. The existing `ssh-` prefix is retained for compatibility with current user configs but removed from the official documentation to discourage its use. Signed-off-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions