# [PATCH 2/2] t/t7508-status.sh: use test_i18ncmp 3 messages from 2011-11-05 to 2011-11-05. Participants: Ævar Arnfjörð Bjarmason. Thread: https://gitlist.dev/t/28855 ## Ævar Arnfjörð Bjarmason, 2011-11-05 17:28 Subject: [PATCH 0/2] i18n: fix GETTEXT_POISON=YesPlease breakages Message-ID: <1320514123-18842-1-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1320514123-18842-1-git-send-email-avarab%40gmail.com ``` This fixes things broken in the test suite under GETTEXT_POISON=YesPlease. Ævar Arnfjörð Bjarmason (2): t/t6030-bisect-porcelain.sh: use test_i18ngrep t/t7508-status.sh: use test_i18ncmp t/t6030-bisect-porcelain.sh | 2 +- t/t7508-status.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.7.7 ``` ## Ævar Arnfjörð Bjarmason, 2011-11-05 17:28 Subject: [PATCH 1/2] t/t6030-bisect-porcelain.sh: use test_i18ngrep Message-ID: <1320514123-18842-2-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1320514123-18842-2-git-send-email-avarab%40gmail.com In-Reply-To: <1320514123-18842-1-git-send-email-avarab@gmail.com> ``` Change a i18n-specific grep in t/t6030-bisect-porcelain.sh to use test_i18ngrep instead. This was introduced in v1.7.7.2~5^2~11 and has been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t6030-bisect-porcelain.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index c6f1f9f..691e4a4 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if cp .git/BISECT_START saved && test_must_fail git bisect start $HASH4 foo -- && git branch > branch.output && - grep "* (no branch)" branch.output > /dev/null && + test_i18ngrep "* (no branch)" branch.output > /dev/null && test_cmp saved .git/BISECT_START ' test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' ' -- 1.7.7 ``` ## Ævar Arnfjörð Bjarmason, 2011-11-05 17:28 Subject: [PATCH 2/2] t/t7508-status.sh: use test_i18ncmp Message-ID: <1320514123-18842-3-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1320514123-18842-3-git-send-email-avarab%40gmail.com In-Reply-To: <1320514123-18842-1-git-send-email-avarab@gmail.com> ``` Change a i18n-specific comparison in t/t7508-status.sh to use test_i18ncmp instead. This was introduced in v1.7.6.3~11^2 and has been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t7508-status.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 905255a..fc57b13 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -189,7 +189,7 @@ test_expect_success 'status with gitignore' ' # untracked EOF git status --ignored >output && - test_cmp expect output + test_i18ncmp expect output ' test_expect_success 'status with gitignore (nothing untracked)' ' @@ -247,7 +247,7 @@ test_expect_success 'status with gitignore (nothing untracked)' ' # untracked EOF git status --ignored >output && - test_cmp expect output + test_i18ncmp expect output ' rm -f .gitignore -- 1.7.7 ```