On Wed, Apr 30, 2014 at 10:35 AM, Karsten Blees <karsten.blees@xxxxxxxxx> wrote: > Am 29.04.2014 11:12, schrieb Marat Radchenko: >> On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. >> Fix `warning: passing argument 2 of 'mingw_main' from incompatible >> pointer type` in http-fetch.c and remote-curl.c by dropping 'const'. >> > > Would you mind cross checking your changes with the msysgit fork? Fixing the same thing in a slightly different manner will just cause unnecessary conflicts (i.e. unnecessary work for the Git for Windows maintainers, as well as for you to come up with an alternate solution for something that's long been fixed). > > See https://github.com/msysgit/git/commit/9206e7fd (squashed from https://github.com/msysgit/git/commit/0115ef83 and https://github.com/msysgit/git/commit/6949537a). > While it's certainly a good point, I think this is *our* fault for not upstreaming our changes, and the responsibility of cleaning up merges should lie on our shoulders. We've diverged a lot. Sure, Dscho does a great job making the divergence less painful, but IMO we should try to reduce the delta as well. For instance, I think the Unicode-support patches have proven themselves by now and should go upstream. And there's probably a ton of smaller free-standing clean-ups that could get the same treatment. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html