Re: What's cooking in git.git (Feb 2010, #02; Sun, 07)

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Feb 8, 2010, 08:29 UTC
Message-ID: <4B6FCB4D.6070602@viscovery.net>
In-Reply-To: <7vhbpswju3.fsf@alter.siamese.dyndns.org>

Junio C Hamano schrieb:

Show 16 quoted lines

> * sp/maint-push-sideband (2010-02-05) 6 commits
>  - receive-pack: Send hook output over side band #2
>  - receive-pack: Wrap status reports inside side-band-64k
>  - receive-pack: Refactor how capabilities are shown to the client
>  - send-pack: demultiplex a sideband stream with status data
>  - run-command: support custom fd-set in async
>  - run-command: Allow stderr to be a caller supplied pipe
>  (this branch is used by sp/push-sideband.)
> 
> Based on 1.6.5 maintenance track
> 
> * sp/push-sideband (2010-02-05) 0 commits
>  (this branch uses sp/maint-push-sideband.)
> 
> And my conflict resolution in #ifdef WINDOWS codepath (meaning: untested,
> please check).

The resolution is correct. I'm using this branch in my private build on Windows; so far it works as expected.

-- Hannes