From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:41:38 +0000 (+0000) Subject: i18n: git-branch "(no branch)" message X-Git-Tag: v1.7.5-rc1~19^2~54 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=409fa556ce5c7e680d773d4bb01ca2c3162a9e9d;p=git.git i18n: git-branch "(no branch)" message Gettextize the "(no branch)" message that's shown by "git branch" when you're in a detached HEAD. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/branch.c b/builtin/branch.c index 4c1a25624..244589e73 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -476,7 +476,7 @@ static void show_detached(struct ref_list *ref_list) if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { struct ref_item item; - item.name = xstrdup("(no branch)"); + item.name = xstrdup(_("(no branch)")); item.len = strlen(item.name); item.kind = REF_LOCAL_BRANCH; item.dest = NULL; diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 6028748c6..4ef7d0911 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -72,7 +72,7 @@ cat >expect <<'EOF' branch-two master EOF -test_expect_success 'git branch shows detached HEAD properly' ' +test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' ' git checkout HEAD^0 && git branch >actual && test_cmp expect actual