Re: Git v1.8.4.2 test failure in ./t5570-git-daemon.sh

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 30, 2013, 01:12 UTC
Message-ID: <xmqqr4b3d0it.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20131029013024.GA11861@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 25 quoted lines

> On Tue, Oct 29, 2013 at 01:54:31AM +0100, Simon Ruderich wrote:
>
>> I just compiled Git v1.8.4.2 on Debian Wheezy amd64 and test
>> t5570 fails (with GIT_TEST_GIT_DAEMON=1):
>> [...]
>> Bisecting leads to this commit:
>> 
>>     commit 68b939b2f097b6675c4aaa178655559aa81b25cb
>>     Author: Jeff King <peff@peff.net>
>>     Date:   Wed Sep 18 16:05:13 2013 -0400
>> 
>>         clone: send diagnostic messages to stderr
>
> This is already fixed by Brian Gernhardt's 360a326 (t5570: Update for
> clone-progress-to-stderr branch, 2013-10-21).
>
> Junio, that patch seems to have gone onto jc/upload-pack-send-symref,
> but should have gone onto jk/clone-progress-to-stderr. The latter made
> it into maint for v1.8.4.2, but the former did not.
>
> I think it was just a simple mixup caused by Brian sending two fixups to
> t5570 as series, when they are really fixups for two different topics.
> Not worth an immediate v1.8.4.3, I think, but you may want to
> cherry-pick 360a326 onto maint if there is another release before
> v1.8.5.

I am torn on this, actually. I've been hoping that the other topic that fixes a long-standing bug will also be a part of maintenance track.