зеркало из https://github.com/microsoft/git.git
i18n: git-branch "Deleted branch [...]" message
Gettextize the "Deleted %sbranch %s (was %s).\n" messages. test in t3200-branch.sh explicitly checked for this message. Change it to skip under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
2852e1dd5d
Коммит
8af42b0f77
|
@ -214,7 +214,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
|
|||
ret = 1;
|
||||
} else {
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
printf("Deleted %sbranch %s (was %s).\n", remote,
|
||||
printf(_("Deleted %sbranch %s (was %s).\n"), remote,
|
||||
bname.buf,
|
||||
find_unique_abbrev(sha1, DEFAULT_ABBREV));
|
||||
strbuf_addf(&buf, "branch.%s", bname.buf);
|
||||
|
|
|
@ -203,7 +203,7 @@ test_expect_success 'test deleting branch deletes branch config' \
|
|||
test -z "$(git config branch.my7.remote)" &&
|
||||
test -z "$(git config branch.my7.merge)"'
|
||||
|
||||
test_expect_success 'test deleting branch without config' \
|
||||
test_expect_success C_LOCALE_OUTPUT 'test deleting branch without config' \
|
||||
'git branch my7 s &&
|
||||
sha1=$(git rev-parse my7 | cut -c 1-7) &&
|
||||
test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."'
|
||||
|
|
Загрузка…
Ссылка в новой задаче