On Oct 21, 2010, at 11:05 AM, Jonathan Nieder wrote: > Kevin Ballard wrote: > >> +++ b/t/t8002-blame.sh >> @@ -6,4 +6,9 @@ test_description='git blame' >> PROG='git blame -c' >> . "$TEST_DIRECTORY"/annotate-tests.sh >> >> +PROG='git blame -c -e' >> +test_expect_success 'Blame --show-email works' ' >> + check_count "<A@xxxxxxxx>" 1 "<B@xxxxxxxx>" 1 "<B1@xxxxxxxx>" 1 "<B2@xxxxxxxx>" 1 "<author@xxxxxxxxxxx>" 1 "<C@xxxxxxxx>" 1 "<D@xxxxxxxx>" 1 >> +' >> + > > Bonus nit: does this belong in annotate-tests.sh or does it only apply > to "git blame" and not "git annotate"? If the latter, a note in the > commit message would be helpful. --show-email originally only applied to git-blame. I tweaked the patch to make it apply to git-annotate simply because check_count can't handle the format of git-blame, but the intention of the change wasn't to make it apply to git-annotate in the first place. You'll note I also didn't document it in the manpage for git-annotate. If you think it's better to move it into annotate-tests.sh, I can do that, but that does mean officially declaring git-annotate as supporting --show-email. -Kevin Ballard-- 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