Hi Peff, On Fri, 1 Jul 2016, Jeff King wrote: > On Fri, Jul 01, 2016 at 03:39:03PM +0200, Johannes Schindelin wrote: > > > > The description was sufficiently long that I didn't want to try > > > repeating it, and opted for a reference instead. If you're planning to > > > fix mingw_main(), I'd be happy to do that as a preparatory patch, and > > > then just skip this trickery entirely. :) > > > > Deal: > > > > ½/5 is in 5c54dff5c54e68a1101d8fe37aefc6158fddd7f2 and the fixup for 1/5 > > is in 7b74f7aabb56b428c74f5983c066dc9ea8fe5116 in the 'common-main' branch > > on https://github.com/dscho/git. > > Hrm. I didn't find 5c54dff5c when I fetched from dscho/git. However, > having seen 7b74f7aa, the one that comes on top, I actually think that's > what we really want anyway. It's really my first patch that makes your > cleanup safe to do. The reason is obvious: I forgot to push :-( Hopefully you did not duplicate all my work to move my patch in front of the branch, to make it a preparatory patch. It is pushed now. Sorry! Dscho