averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/fast-import-export-i18n-cleanup'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2025-11-06 15:17:01 -08:00
parent 5db9d35a28 93cef5bda5
commit e569dced68
5 changed files with 195 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gpg-interface.c
View File

@@ -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);