Stefan Pfetzing <stefan.pfetzing@xxxxxxxxx> wrote: > Hi, > > for some reason I could not yet figure out, t8001-annotate.sh fails at test > 18. > > --- snip --- > * ok 17: some edit > * expecting success: check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 > Author A (expected 1, attributed 1) good > Author B1 (expected 1, attributed 1) good > Author D (expected 1, attributed 2) bad > Author A U Thor (expected 1, attributed 1) good > Author B2 (expected 1, attributed 1) good > Author B (expected 1, attributed 1) good > * FAIL 18: some edit > check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 > * failed 1 among 18 test(s) I've been seeing the same failed test case for a long time now on my own Mac OS X system. I think it has to do with the "git blame" vs. "git annotate" war which never really happened. I think we had hoped that one of the two tools would prove to be _the_ annotation/blame tool and would get used but thus far that hasn't happened. Since they are two different implementations they also differ slightly over how they attribute a change across a merge, and in this case annotate is producing a different result from blame - but that different result isn't considered to be wrong so it hasn't been changed in annotate. Meanwhile the test has stayed broken as a reminder that these two generate different results. -- Shawn. - : 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