diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:00 -0700 |
commit | bc67ad8c375ce8f31021411f088a968f12cb2675 (patch) | |
tree | 5cc9d598cf4040177c3765322f9b5f2551ba0d08 /t/t8002-blame.sh | |
parent | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint (diff) | |
parent | t/annotate-tests: Use echo & cat instead of sed (diff) | |
download | tgif-bc67ad8c375ce8f31021411f088a968f12cb2675.tar.xz |
Merge branch 'js/blame-parsename' into maint
* js/blame-parsename:
t/annotate-tests: Use echo & cat instead of sed
blame: tolerate bogus e-mail addresses a bit better
Diffstat (limited to 't/t8002-blame.sh')
-rwxr-xr-x | t/t8002-blame.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh index d3a51e1269..e2896cffc1 100755 --- a/t/t8002-blame.sh +++ b/t/t8002-blame.sh @@ -8,7 +8,7 @@ PROG='git blame -c' PROG='git blame -c -e' test_expect_success 'Blame --show-email works' ' - check_count "<A@test.git>" 1 "<B@test.git>" 1 "<B1@test.git>" 1 "<B2@test.git>" 1 "<author@example.com>" 1 "<C@test.git>" 1 "<D@test.git>" 1 + check_count "<A@test.git>" 1 "<B@test.git>" 1 "<B1@test.git>" 1 "<B2@test.git>" 1 "<author@example.com>" 1 "<C@test.git>" 1 "<D@test.git>" 1 "<E at test dot git>" 1 ' test_done |