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>

diff --git a/sha1_name.c b/sha1_name.c
index 361708b7bb229ff53eb166b9cefc220fe0eedcc5..c6331136d19c5224078fa78b6e5e794fcc587fe2 100644 (file)
--- a/sha1_name.c
+++ b/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);

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index e742ce03322b6e3638147538cc0d1bc9b3a44ba2..d6e576192fcd014ed5f570ceeab1152b93d91d1f 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/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' '