diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:54 -0800 |
| commit | 0b430a17ae88e56703270af7e29f845ffc7a891c (patch) | |
| tree | e7085187725499f3a3ba81f3f99d677256c809d8 /t/t7500-commit.sh | |
| parent | 7f5673d7030a4792319917ece0484d8379aa811f (diff) | |
| download | git-0b430a17ae88e56703270af7e29f845ffc7a891c.tar.gz git-0b430a17ae88e56703270af7e29f845ffc7a891c.tar.xz | |
i18n: git-commit "enter the commit message" message
Gettextize the "# Please enter the commit message for your changes."
message. Several tests in t7500-commit.sh and t7502-commit.sh assume
that this message starts with a newline. Change the tests to to skip
under GETTEXT_POISON=YesPlease.
These fail under GETTEXT_POISON=YesPlease because the poison editor
message doesn't do the right thing with comments and line breaks, so
these messages will be incorrectly broken up across lines.
This test should not be skipped under a hypothetical future testing
mode that tests Git under language locales, since those messages
should all start with a newline like the original.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7500-commit.sh')
| -rwxr-xr-x | t/t7500-commit.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index d551b77ce..a101256df 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -64,7 +64,7 @@ test_expect_success 'adding comments to a template should not commit' ' ) ' -test_expect_success 'adding real content to a template should commit' ' +test_expect_success C_LOCALE_OUTPUT 'adding real content to a template should commit' ' ( test_set_editor "$TEST_DIRECTORY"/t7500/add-content && git commit --template "$TEMPLATE" @@ -72,7 +72,7 @@ test_expect_success 'adding real content to a template should commit' ' commit_msg_is "template linecommit message" ' -test_expect_success '-t option should be short for --template' ' +test_expect_success C_LOCALE_OUTPUT '-t option should be short for --template' ' echo "short template" > "$TEMPLATE" && echo "new content" >> foo && git add foo && @@ -83,7 +83,7 @@ test_expect_success '-t option should be short for --template' ' commit_msg_is "short templatecommit message" ' -test_expect_success 'config-specified template should commit' ' +test_expect_success C_LOCALE_OUTPUT 'config-specified template should commit' ' echo "new template" > "$TEMPLATE" && git config commit.template "$TEMPLATE" && echo "more content" >> foo && @@ -282,7 +282,7 @@ test_expect_success 'commit --squash works with -c for same commit' ' commit_msg_is "squash! edited commit" ' -test_expect_success 'commit --squash works with editor' ' +test_expect_success C_LOCALE_OUTPUT 'commit --squash works with editor' ' commit_for_rebase_autosquash_setup && test_set_editor "$TEST_DIRECTORY"/t7500/add-content && git commit --squash HEAD~1 && |