Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > On Thu, 21 Feb 2008, Junio C Hamano wrote: >> >> but I am wondering if we should instead really _remove_ entries >> from the index instead, just like the attached patch. > ... > So your patch looks very good to me. Basically, the merge code absolutely > does not want to be called with some entries already marked as CE_REMOVE > (it's supposed to *add* those markers as part of resolving the merge, but > it is not able to handle them in the source). > > So ack, ack, ack. And we probably should unhash the entry instead of just removing it? Come to think of it, I am starting to wonder if the entries unpack-trees add to and drop from the index are hashed and unhashed correctly... - 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
