On Sun, 2017-02-12 at 15:49 -0800, Junio C Hamano wrote: > The fact that we have the above two choices tells me that a two-step > approach may be an appropriate approach. [...] > Even if you did only the first step, as long as the second step can > be done without reverting what the first step did [*4*] by somebody > who cares the "specific error" deeply enough, I am OK with that. Of > course if you did both steps, that is fine by me as well ;-) I appreciate the flexibility, but now that I've spent the time to understand all the code involved, it would be a pity not to go for the complete solution. New patch coming. Matt