summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:53 (GMT)
commit409fa556ce5c7e680d773d4bb01ca2c3162a9e9d (patch)
tree1c4f6b4ff84e758831c7c678e684f6928bd2c92b
parenta5760906e78adeab2ae8f404528c4ce10d046f5c (diff)
downloadgit-409fa556ce5c7e680d773d4bb01ca2c3162a9e9d.zip
git-409fa556ce5c7e680d773d4bb01ca2c3162a9e9d.tar.gz
git-409fa556ce5c7e680d773d4bb01ca2c3162a9e9d.tar.bz2
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/branch.c2
-rwxr-xr-xt/t3203-branch-output.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 4c1a256..244589e 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 6028748..4ef7d09 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