Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > On Mon, 30 Jul 2007, Junio C Hamano wrote: >> >> I guess so, but can higher stage entries have cached stat >> information that are valid and match the working tree? > > Probably unlikely, but I could imagine that it's the case for things that > failed to merge entirely (ie binaries), where you end up just saying "pick > the old/base binary", and it ends up matching in stage1. Probably. In any case, what I'll commit will have the stage#0 check, just to be safe anyway. Thanks for the sanity. Really appreciate it. - 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
