On Fri, Jun 13, 2008 at 04:09:05PM -0700, Junio C Hamano wrote: > When telling apply to affect index and work tree at the same time (that is > what --index means), the caller must make sure that the diff-files won't > report stale stat information. Ah, I had assumed that git-apply would notice the stale stat information and fall back to checking the content, which should be accurate. > I think "reset --hard" without ">empty" is enough as the head commit > records an empty blob there. Yes, it is redundant. With your patch I was not able to reproduce the problem over a few thousand trials. -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