Re: [PATCH] i18n: use test_i18ncmp in t2020 (checkout --detach)

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Apr 13, 2012, 23:46 UTC
Message-ID: <20120413234607.GE13995@burratino>
In-Reply-To: <20120413233010.GA16663@sigill.intra.peff.net>

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.

>> Jeff King wrote:

Show 14 quoted lines

>>> When leaving a detached HEAD, we do a revision walk to make
>>> sure the commit we are leaving isn't being orphaned.
>>> However, this leaves crufty marks in the commit objects
>>> which can confuse later walkers, like the one in
>>> stat_tracking_info.
>>>
>>> Let's clean up after ourselves to prevent this conflict.
>>
>> Very nice thing to do.  Thanks.
>
> A minor complaint, but the format of your email left me confused for
> several minutes, as I didn't remember writing that or working in this
> area recently. It turns out that it is because this commit was from over
> a year ago.

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@gmail.com>
	Explained-by: Jeff King <peff@peff.net>