summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-01 23:54:58 (GMT)
committerJeff King <peff@peff.net>2015-12-01 23:54:58 (GMT)
commitfd13a2ecfbda734a54e22695e0219e89682bdd22 (patch)
tree36a26032389de87c716fa563403b85f89820d97e /t
parent43ed3827ed5ce06692d02e0f0c6809ff5812bb6e (diff)
parent7cb5f7c44dfea798a5ad99ee5b42fdaf8de4e379 (diff)
downloadgit-fd13a2ecfbda734a54e22695e0219e89682bdd22.zip
git-fd13a2ecfbda734a54e22695e0219e89682bdd22.tar.gz
git-fd13a2ecfbda734a54e22695e0219e89682bdd22.tar.bz2
Merge branch 'mk/blame-first-parent'
Regression fix for a topic already in master. * mk/blame-first-parent: blame: fix object casting regression
Diffstat (limited to 't')
-rw-r--r--t/annotate-tests.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b1673b3..093832f 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -68,6 +68,13 @@ test_expect_success 'blame 1 author' '
check_count A 2
'
+test_expect_success 'blame by tag objects' '
+ git tag -m "test tag" testTag &&
+ git tag -m "test tag #2" testTag2 testTag &&
+ check_count -h testTag A 2 &&
+ check_count -h testTag2 A 2
+'
+
test_expect_success 'setup B lines' '
echo "2A quick brown fox jumps over the" >>file &&
echo "lazy dog" >>file &&