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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
8af42b0f7773bff2529f6c8990bb3d872b8270d5
2 files changed
+2
-2
builtin/branch.c
+1
-1
@@ -214,7 +214,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
214
ret = 1;
215
} else {
216
struct strbuf buf = STRBUF_INIT;
217
- printf("Deleted %sbranch %s (was %s).\n", remote,
217
+ printf(_("Deleted %sbranch %s (was %s).\n"), remote,
218
bname.buf,
219
find_unique_abbrev(sha1, DEFAULT_ABBREV));
220
strbuf_addf(&buf, "branch.%s", bname.buf);
t/t3200-branch.sh
+1
-1
@@ -203,7 +203,7 @@ test_expect_success 'test deleting branch deletes branch config' \
203
test -z "$(git config branch.my7.remote)" &&
204
test -z "$(git config branch.my7.merge)"'
205
206
-test_expect_success 'test deleting branch without config' \
206
+test_expect_success C_LOCALE_OUTPUT 'test deleting branch without config' \
207
'git branch my7 s &&
208
sha1=$(git rev-parse my7 | cut -c 1-7) &&
209
test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."'