Merge branch 'maint'

diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 9e5a04b0f93fca15628acc93d4c2dcb896cba0d6..eabec2e06e2f97fc1790cd4ce30a80e402d4a205 100755 (executable)
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -1,9 +1,15 @@
 #!/bin/sh
 
-test_description='git-annotate'
+test_description='git annotate'
 . ./test-lib.sh
 
 PROG='git annotate'
-source ../annotate-tests.sh
+. ../annotate-tests.sh
+
+test_expect_success \
+    'Annotating an old revision works' \
+    '[ $(git annotate file master | awk "{print \$3}" | grep -c "^A$") -eq 2 ] && \
+     [ $(git annotate file master | awk "{print \$3}" | grep -c "^B$") -eq 2 ]'
+
 
 test_done