diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-06 15:17:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-06 15:17:01 -0800 |
| commit | e569dced68a486b38b14cdd2e3e0b34d21752a18 (patch) | |
| tree | 8d6186e4278c3af315b66d06930f225117a6c86f /gpg-interface.c | |
| parent | 5db9d35a28f4fca5d13692f589a3bfcd5cd896cb (diff) | |
| parent | 93cef5bda5f5d6f36b8442dd6bd871289bc48f10 (diff) | |
Merge branch 'cc/fast-import-export-i18n-cleanup'
Messages from fast-import/export are now marked for i18n.
* cc/fast-import-export-i18n-cleanup:
gpg-interface: mark a string for translation
fast-import: mark strings for translation
fast-export: mark strings for translation
gpg-interface: use left shift to define GPG_VERIFY_*
gpg-interface: simplify ssh fingerprint parsing
Diffstat (limited to 'gpg-interface.c')
| -rw-r--r-- | gpg-interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gpg-interface.c b/gpg-interface.c index d1e88da8c1..f680ed38c0 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -443,7 +443,7 @@ static void parse_ssh_output(struct signature_check *sigc) key = strstr(line, "key "); if (key) { - sigc->fingerprint = xstrdup(strstr(line, "key ") + 4); + sigc->fingerprint = xstrdup(key + 4); sigc->key = xstrdup(sigc->fingerprint); } else { /* @@ -879,7 +879,7 @@ static char *get_default_ssh_signing_key(void) n = split_cmdline(key_command, &argv); if (n < 0) - die("malformed build-time gpg.ssh.defaultKeyCommand: %s", + die(_("malformed build-time gpg.ssh.defaultKeyCommand: %s"), split_cmdline_strerror(n)); strvec_pushv(&ssh_default_key.args, argv); |