2012/8/28 Junio C Hamano <gitster@xxxxxxxxx>: > Jiang Xin <worldhello.net@xxxxxxxxx> writes: > >> 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 <worldhello.net@xxxxxxxxx> >> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> >> --- >> ... >> @@ -77,6 +75,14 @@ test_expect_success 'add another remote' ' >> ) >> ' >> >> +test_expect_success C_LOCALE_OUTPUT 'add another remote' ' >> +( >> + cd test && >> + check_remote_track origin master side && >> + check_remote_track second master side another && >> +) >> +' > > This couldn't have possibly passed with the trailing &&, or am I > missing something? There is already "add another remote" before > this test that adds "second" remote. Is this test about "add > yet another remote", or is it checking the result of adding "second" > that was done in the previous step? The trailing "&&“ is a copy & paste error. I only run my fixup in GIT_GETTEXT_POISON mode in a harry, not noticed the bypassed testcase has this serious bug. I split the original "add another remote" into two blocks. One is a normal testcase, and another has a C_LOCALE_OUTPUT prereq flag. This is because other testcases depend on the operations in "add another remote" testcase ('git remote add -f second ../two'), and these testcases would fail if add C_LOCALE_OUTPUT prereq to the whole "add another remote" testcase. > > Will queue with an obvious fix-up with retitle, 'check tracking', or > something. > > Thanks. -- 蒋鑫 北京群英汇信息技术有限公司 邮件: worldhello.net@xxxxxxxxx 网址: http://www.ossxp.com/ 博客: http://www.worldhello.net/ 微博: http://weibo.com/gotgit/ 电话: 010-51262007, 18601196889 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html