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

Johannes Schindelin [off-list ref] writes:

Hi Junio,

On Fri, 1 Jul 2016, Junio C Hamano wrote:

quoted

* 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" ;-)

While at it, it would be nice if this patch:

quoted

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

Hi Junio,

On Wed, 6 Jul 2016, Junio C Hamano wrote:

Johannes Schindelin [off-list ref] writes:

quoted

On Fri, 1 Jul 2016, Junio C Hamano wrote:

quoted

* 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" ;-)

I missed that ;-)

quoted

While at it, it would be nice if this patch:

quoted

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

I am sure I will forget, too, but I'll try my best not to!

Thanks,
Dscho