mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'as/ssh-signing-improve-key-missing-error'

Browse Source 
Improve the error message given when private key is not loaded in
the ssh agent in the codepath to sign with an ssh key.

* as/ssh-signing-improve-key-missing-error:
  ssh signing: better error message when key not in agent
This commit is contained in:
Junio C Hamano
2023-02-03 16:08:21 -08:00
parent 86cca7593e dce7b31126
commit c7757b2781
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gpg-interface.c
View File

@ -998,6 +998,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
char *ssh_signing_key_file = NULL; char *ssh_signing_key_file = NULL;
struct strbuf ssh_signature_filename = STRBUF_INIT; struct strbuf ssh_signature_filename = STRBUF_INIT;
const char *literal_key = NULL; const char *literal_key = NULL;
int literal_ssh_key = 0;
if (!signing_key || signing_key[0] == '\0') if (!signing_key || signing_key[0] == '\0')
return error( return error(
@ -1005,6 +1006,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
if (is_literal_ssh_key(signing_key, &literal_key)) { if (is_literal_ssh_key(signing_key, &literal_key)) {
/* A literal ssh key */ /* A literal ssh key */
literal_ssh_key = 1;
key_file = mks_tempfile_t(".git_signing_key_tmpXXXXXX"); key_file = mks_tempfile_t(".git_signing_key_tmpXXXXXX");
if (!key_file) if (!key_file)
return error_errno( return error_errno(
@ -1039,8 +1041,10 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
"-Y", "sign", "-Y", "sign",
"-n", "git", "-n", "git",
"-f", ssh_signing_key_file, "-f", ssh_signing_key_file,
buffer_file->filename.buf,
NULL); NULL);
if (literal_ssh_key)
strvec_push(&signer.args, "-U");
strvec_push(&signer.args, buffer_file->filename.buf);
sigchain_push(SIGPIPE, SIG_IGN); sigchain_push(SIGPIPE, SIG_IGN);
ret = pipe_command(&signer, NULL, 0, NULL, 0, &signer_stderr, 0); ret = pipe_command(&signer, NULL, 0, NULL, 0, &signer_stderr, 0);