From: Ævar Arnfjörð Bjarmason Date: Sat, 5 Nov 2011 17:28:42 +0000 (+0000) Subject: t/t6030-bisect-porcelain.sh: use test_i18ngrep X-Git-Tag: v1.7.8-rc1~2^2~1 X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=475b3777bdae3c7c36f383a6a58f999111bffa18 t/t6030-bisect-porcelain.sh: use test_i18ngrep 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index b3d1b1430..d13fdc84c 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -152,7 +152,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' '