Thanks for the regen. I don't think git format is the problem as most of my patches are fine, it's probably because it was in a patch queue and so the parent isn't actually a known commit. I haven't tested whether this works without my other console patches but I think it should.

Is there a surrogatepass option? If so, I'll definitely use that, as that'll fix the one remaining edge case.

I suspect we'll have to go to Guido to get a ruling on the default, but I'll add an environment variable to switch.