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

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

[Simon Ruderich]

Hello,

I just compiled Git v1.8.4.2 on Debian Wheezy amd64 and test
t5570 fails (with GIT_TEST_GIT_DAEMON=1):

    --- expect      2013-10-28 23:27:26.792409631 +0000
    +++ output      2013-10-28 23:27:26.788409614 +0000
    @@ -1 +1,2 @@
    +Cloning into 'nowhere'...
     fatal: remote error: access denied or repository not exported: /nowhere.git
    [18908] [19625] Disconnected (with error)
    not ok 9 - clone non-existent

    --- expect      2013-10-28 23:27:26.944410377 +0000
    +++ output      2013-10-28 23:27:26.944410377 +0000
    @@ -1 +1,2 @@
    +Cloning into 'nowhere'...
    fatal: remote error: no such repository: /nowhere.git
    [19727] [19747] Disconnected (with error)
    not ok 13 - clone non-existent

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

        Putting messages like "Cloning into.." and "done" on stdout
        is un-Unix and uselessly clutters the stdout channel. Send
        them to stderr.

        We have to tweak two tests to accommodate this:

        1. t5601 checks for doubled output due to forking, and
            doesn't actually care where the output goes; adjust it
            to check stderr.

        2. t5702 is trying to test whether progress output was
            sent to stderr, but naively does so by checking
            whether stderr produced any output. Instead, have it
            look for "%", a token found in progress output but not
            elsewhere (and which lets us avoid hard-coding the
            progress text in the test).

        This should not regress any scripts that try to parse the
        current output, as the output is already internationalized
        and therefore unstable.

Regards
Simon
-- 
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9

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

[Jeff King]

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.

-Peff

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

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> 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.

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

[Jeff King]

On Tue, Oct 29, 2013 at 06:12:58PM -0700, Junio C Hamano wrote:

> > 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.

That is fine, too. Mainly I just did not want it to get forgotten. :)

-Peff