On Mon, Apr 25, 2011 at 11:04:10PM +0200, Johannes Sixt wrote: > > In the comments for 1/2, you said this goes directly on 38a81b4e. But in > > that commit, we use #ifndef WIN32 to decide whether or not to fork for > > async code. So shouldn't this use the same test (I don't even see > > ASYNC_AS_THREAD defined anywhere else)? > > Here's the fixed patch. I squashed both earlier patches into a single patch > because they are about the same topic, as you showed with your tests of > git-push via smart http. Thanks, this one looks good to me, and I think the squash is sensible. > Again, this should go on top of 38a81b4e. When it is merged to f6b60983 or > later, the '#ifndef WIN32' must be changed to '#ifdef NO_PTHREADS'. I see Junio has an evil merge in pu that takes care of this. I wonder if it might have been nicer to "cherry-pick -n" the old fix on top of master, fixing up the tree to use NO_PTHREADS, and then resolving the ensuing merge conflict in favor of the cherry-picked version. . I guess it is just a matter of style (the fact that a few of our archaeology tools do not find content in evil merges very well is a downside, but that just means we should fix the tools :) ). -Peff -- 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