Hi Junio, On Tue, May 5, 2015 at 1:35 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > I didn't like the grepping of error messages alone as a way to > diagnose the failure, though. When we expect the pull to fail > without touching anything in the working tree, I'd prefer to see > that tested explicitly (e.g. "if pull mistakenly tried to go ahead > and touch this file that would be involved in the merge, its > contents would change---let's make sure that does not happen by > making sure the contents before and after are the same" kind of > thing). Yes, you're right. Some tests do need these additional checks. Will add them in the re-roll. Just to be sure, aside from checking that git-pull does not touch files it should not touch in the event of an error, I do believe we also need to check its error message, as printing out the correct user-friendly error messages is one of the features of git-pull. Regards, Paul -- 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