diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-03 07:27:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-03 07:27:57 -0800 |
| commit | 41a35c3e52b18bfc36a89cfe99f78cc74dacf6b5 (patch) | |
| tree | f6a06d0448dde5dd035af4ec3d162b330d0ace1d /gpg-interface.c | |
| parent | Merge branch 'rz/t0450-bisect-doc-update' into next (diff) | |
| parent | gpg-interface: mark a string for translation (diff) | |
| download | git-41a35c3e52b18bfc36a89cfe99f78cc74dacf6b5.tar.gz git-41a35c3e52b18bfc36a89cfe99f78cc74dacf6b5.zip | |
Merge branch 'cc/fast-import-export-i18n-cleanup' into next
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); |