On Thu, Jun 20, 2013 at 01:49:13PM -0700, Junio C Hamano wrote: > > But read-tree already does > > the hard work for us, so I don't think it is a lot of code either way. > > OK, I just got an impression from reading the back-and-forth between > you two that read-tree does not want to deal with that case. I think I got us off-track with my expectation of ending the one case with a conflicted index. But caring about that is even more unlikely. I think Thomas's original patch is probably a happy medium. As an orthogonal matter, we probably should reverse the order of updating HEAD and the index/working tree, as it does not make much sense to me to do the former if the latter is not possible (and that is the case even with the current code). -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