Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

i18n: mark @{upstream} error messages for translation

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 647202889397e775c294234ebd3df8b2c4473f0f 1 parent 17c8221
@keszybz keszybz authored gitster committed
Showing with 9 additions and 9 deletions.
  1. +4 −4 sha1_name.c
  2. +5 −5 t/t1507-rev-parse-upstream.sh
View
8 sha1_name.c
@@ -861,15 +861,15 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
* points to something different than a branch.
*/
if (!upstream)
- return error("HEAD does not point to a branch");
+ return error(_("HEAD does not point to a branch"));
if (!upstream->merge || !upstream->merge[0]->dst) {
if (!ref_exists(upstream->refname))
- return error("No such branch: '%s'", cp);
+ return error(_("No such branch: '%s'"), cp);
if (!upstream->merge)
- return error("No upstream configured for branch '%s'",
+ return error(_("No upstream configured for branch '%s'"),
upstream->name);
return error(
- "Upstream branch '%s' not stored as a remote-tracking branch",
+ _("Upstream branch '%s' not stored as a remote-tracking branch"),
upstream->merge[0]->src);
}
free(cp);
View
10 t/t1507-rev-parse-upstream.sh
@@ -129,7 +129,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
fatal: Needed a single revision
EOF
error_message non-tracking@{u} 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success '@{u} error message when no upstream' '
@@ -138,7 +138,7 @@ test_expect_success '@{u} error message when no upstream' '
fatal: Needed a single revision
EOF
test_must_fail git rev-parse --verify @{u} 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'branch@{u} error message with misspelt branch' '
@@ -147,7 +147,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
fatal: Needed a single revision
EOF
error_message no-such-branch@{u} 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success '@{u} error message when not on a branch' '
@@ -157,7 +157,7 @@ test_expect_success '@{u} error message when not on a branch' '
EOF
git checkout HEAD^0 &&
test_must_fail git rev-parse --verify @{u} 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'branch@{u} error message if upstream branch not fetched' '
@@ -166,7 +166,7 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
fatal: Needed a single revision
EOF
error_message bad-upstream@{u} 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'pull works when tracking a local branch' '
Please sign in to comment.
Something went wrong with that request. Please try again.