From: Junio C Hamano Date: Tue, 21 Aug 2012 22:05:46 GMT Subject: Re: [PATCH 6/7] Fix tests under GETTEXT_POISON on git-remote Message-ID: <7v628bdhol.fsf@alter.siamese.dyndns.org> In-Reply-To: <1345523464-14586-7-git-send-email-pclouds@gmail.com> Nguyễn Thái Ngọc Duy writes: > From: Jiang Xin > > Use i18n-specific test functions in test scripts for git-remote. > This issue was was introduced in v1.7.10-233-gbb16d5: > > bb16d5 i18n: remote: mark strings for translation > > and been broken under GETTEXT_POISON=YesPlease since. > > Signed-off-by: Jiang Xin > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > t/t5505-remote.sh | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh > index e8af615..07045e3 100755 > --- a/t/t5505-remote.sh > +++ b/t/t5505-remote.sh > @@ -27,10 +27,16 @@ tokens_match () { > test_cmp expect actual > } > > +tokens_i18nmatch () { > + echo "$1" | tr ' ' '\012' | sort | sed -e '/^$/d' >expect && > + echo "$2" | tr ' ' '\012' | sort | sed -e '/^$/d' >actual && > + test_i18ncmp expect actual > +} > + > check_remote_track () { > actual=$(git remote show "$1" | sed -ne 's|^ \(.*\) tracked$|\1|p') > shift && > - tokens_match "$*" "$actual" > + tokens_i18nmatch "$*" "$actual" > } Which part of the output from "git remote show" does this test expect to be translated? Specifically, does "tracked" ever get translated? It appears that _(" tracked") is indeed marked for translation in the source, so how can we expect value in $actual be any useful for any comparison? Confused...