Re: What's cooking in git.git (Jul 2016, #01; Fri, 1)

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 6, 2016, 14:41 UTC
Message-ID: <xmqqinwivng4.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1607021306320.12947@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 16 quoted lines

> Hi Junio,
>
> On Fri, 1 Jul 2016, Junio C Hamano wrote:
>
>> * jc/t2300-setup (2016-06-22) 1 commit
>>   (merged to 'next' on 2016-06-28 at 62b902a)
>>  + t2300: "git --exec-path" is not usable in $PATH on Windows as-is
>> 
>>  Portability fix for Windows.
>> 
>>  Will merge to 'master'.
>
> Would you mind cherry-picking this onto `maint`, too? I just noticed that
> the test suite does not pass here because `maint` has fe17fc0 (t2300: run
> git-sh-setup in an environment that better mimics the real life,
> 2016-06-01).

s/cherry-pick/merge/;

You'd notice I was prepared if you did "git log maint..jc/t2300-setup" ;-)

Show 14 quoted lines

> While at it, it would be nice if this patch:
>
>> * js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
>>   (merged to 'next' on 2016-06-28 at e673c65)
>>  + mingw: let the build succeed with DEVELOPER=1
>> 
>>  Some platform-specific code had non-ANSI strict declarations of C
>>  functions that do not take any parameters, which has been
>>  corrected.
>> 
>>  Will merge to 'master'.
>
> ... also found its way into maint; This would make it easier for me to
> backport fixes (as I started to rely on DEVELOPER=1 to warn about issues).

Likewise.

I'm sure I'll forget, so if you can please remind me a few weeks after these are merged to 'master'.

Thanks.