Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@xxxxxxxxx>
---
sha1_name.c | 11 ++++++-----
t/t1507-rev-parse-upstream.sh | 10 +++++-----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 5b1b0f9..bd1769e 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -861,15 +861,16 @@ 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 fetched from remote '%s'",
- upstream->merge[0]->src, upstream->remote_name);
+ return error(
+ _("Upstream branch '%s' not fetched from remote '%s'"),
+ upstream->merge[0]->src, upstream->remote_name);
}
free(cp);
cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0);
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 112025f..a827f98 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -130,7 +130,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
EOF
(cd clone &&
test_must_fail git rev-parse --verify non-tracking@{u}) 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success '@{u} error message when no upstream' '
@@ -139,7 +139,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' '
@@ -148,7 +148,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' '
@@ -158,7 +158,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' '
@@ -167,7 +167,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' '
--
1.7.10.344.g387ed
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html