On Fri, Apr 13, 2012 at 06:46:07PM -0500, Jonathan Nieder wrote: > Jeff King wrote: > > > I think it is not "forgot" but "predates" in this case. The commit > > introducing the problem is 8a5b749 (i18n: format_tracking_info "Your > > branch is behind" message, 2012-02-02). But obviously your fix is > > correct either way. > > Oh, that makes sense. I wonder why we didn't notice this before. > GETTEXT_POISON support hit "master" in 2011-05-23. Yes, but this wasn't gettext-ed at all until 2012-02-02, and then it didn't get merged into master until the week after. How often do you run GETTEXT_POISON tests? I know I don't, and obviously Junio does not include them as part of his process before pushing out master. > Yeah, I should have paid attention to the date. A better diagnosis > would be > > When v1.7.9.2~28^2 (2012-02-02) marked the "Your branch is behind > message for translation, it forgot to adjust tests to stop checking > for that message when tests are being run with git configured to write > its output in another language. > > With this patch applied, tests pass with GETTEXT_POISON=YesPlease > again. > > Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> > Explained-by: Jeff King <peff@xxxxxxxx> Yeah, that makes sense to me. It seems like t6040 is broken under GETTEXT_POISON by that commit, too (and is still broken). Probably your patch should deal with both breakages, as their root cause is the same. -Peff -- 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