microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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>
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-04-14 09:54:35 +02:00 коммит произвёл Junio C Hamano
Родитель 17c82211ec
Коммит 6472028893
2 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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. * points to something different than a branch.
*/ */
if (!upstream) 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 (!upstream->merge || !upstream->merge[0]->dst) {
if (!ref_exists(upstream->refname)) if (!ref_exists(upstream->refname))
return error("No such branch: '%s'", cp); return error(_("No such branch: '%s'"), cp);
if (!upstream->merge) if (!upstream->merge)
return error("No upstream configured for branch '%s'", return error(_("No upstream configured for branch '%s'"),
upstream->name); upstream->name);
return error( 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); upstream->merge[0]->src);
} }
free(cp); free(cp);

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 fatal: Needed a single revision
EOF EOF
error_message non-tracking@{u} 2>actual && error_message non-tracking@{u} 2>actual &&
test_cmp expect actual test_i18ncmp expect actual
' '
test_expect_success '@{u} error message when no upstream' ' 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 fatal: Needed a single revision
EOF EOF
test_must_fail git rev-parse --verify @{u} 2>actual && 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' ' 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 fatal: Needed a single revision
EOF EOF
error_message no-such-branch@{u} 2>actual && 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' ' 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 EOF
git checkout HEAD^0 && git checkout HEAD^0 &&
test_must_fail git rev-parse --verify @{u} 2>actual && 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' ' 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 fatal: Needed a single revision
EOF EOF
error_message bad-upstream@{u} 2>actual && 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' ' test_expect_success 'pull works when tracking a local branch' '