Skip to content

Commit e2a33ef

Browse files
committed
Merge branch 'jx/message-fixes'
Fixes to recently added messages. * jx/message-fixes: i18n: fix typos found during l10n for git 2.34.0
2 parents e890c84 + f733719 commit e2a33ef

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

builtin/index-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
14861486
if (!*final_name)
14871487
*final_name = odb_pack_name(name, hash, ext);
14881488
if (finalize_object_file(curr_name, *final_name))
1489-
die(_("unable to rename temporary '*.%s' file to '%s"),
1489+
die(_("unable to rename temporary '*.%s' file to '%s'"),
14901490
ext, *final_name);
14911491
} else if (make_read_only_if_same) {
14921492
chmod(*final_name, 0444);

gpg-interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ static const char *get_default_ssh_signing_key(void)
777777
if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
778778
default_key = strbuf_detach(keys[0], NULL);
779779
} else {
780-
warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
780+
warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
781781
key_stderr.buf, key_stdout.buf);
782782
}
783783

ref-filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
10371037
format->quote_style == QUOTE_TCL) &&
10381038
used_atom[at].atom_type == ATOM_RAW &&
10391039
used_atom[at].u.raw_data.option == RAW_BARE)
1040-
die(_("--format=%.*s cannot be used with"
1040+
die(_("--format=%.*s cannot be used with "
10411041
"--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
10421042
cp = ep + 1;
10431043

0 commit comments

Comments
 (0)