"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > It does. It is caused by the disconnect_helper call inside of > fetch_with_import. You can't disconnect inside of the fetch method > of a transport, the caller is going to disconnect you a second time. > ... > This bug isn't due to the merge, its a bug in Johan's series that > needs to be fixed before it could merge down to next/master. Thanks; I pushed out 'pu' with your v3 this time. Last night I did a trial fetch merge with FETCH_HEAD into 'pu', but then after I queued some fixes to 'maint' and 'master' to prepare for 1.6.5.1, I rebuilt 'pu' with the still-old sp/smart-http topic, and that is what was sitting at k.org til this morning. I am a bit confused about your diagnosis, though. As far as I recall, Johan's topic itself nor 'pu' with Johan's topic but without v2 of sp/smart-http did not have the issue. Does that indicate that the behaviour expected from the fetch method is different between the two topics, and this indeed is a semantic conflict as you suspected initially? In other words, if Johan's series is updated not to disconnect inside the fetch method of the transport, and if it is not merged with your series, does the caller still disconnect it properly? -- 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