undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: fix typos found during l10n for git 2.22.0

Browse Source 
Fix two typos introduced by the following commits:

+ 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24)
+ ed8b4132c8 (remote-curl: mark all error messages for translation,
  2019-03-05)

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin 2019-06-02 23:11:22 +08:00 committed by Junio C Hamano
parent ee70b40e8d
commit 8a1569d655
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -5354,7 +5354,7 @@ static void prep_parse_options(struct diff_options *options)
N_("show the given source prefix instead of \"a/\""), N_("show the given source prefix instead of \"a/\""),
PARSE_OPT_NONEG), PARSE_OPT_NONEG),
OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"), OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
N_("show the given source prefix instead of \"b/\""), N_("show the given destination prefix instead of \"b/\""),
PARSE_OPT_NONEG), PARSE_OPT_NONEG),
OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"), OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
N_("prepend an additional prefix to every line of output"), N_("prepend an additional prefix to every line of output"),

4
remote-curl.c
View File

@ -1117,13 +1117,13 @@ static void parse_fetch(struct strbuf *buf)
const char *q; const char *q;
if (parse_oid_hex(p, &old_oid, &q)) if (parse_oid_hex(p, &old_oid, &q))
die(_("protocol error: expected sha/ref, got %s'"), p); die(_("protocol error: expected sha/ref, got '%s'"), p);
if (*q == ' ') if (*q == ' ')
name = q + 1; name = q + 1;
else if (!*q) else if (!*q)
name = ""; name = "";
else else
die(_("protocol error: expected sha/ref, got %s'"), p); die(_("protocol error: expected sha/ref, got '%s'"), p);
ref = alloc_ref(name); ref = alloc_ref(name);
oidcpy(&ref->old_oid, &old_oid); oidcpy(&ref->old_oid, &old_oid);