summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Anderson <ryan@michonline.com>2006-07-04 01:30:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-04 01:41:58 (GMT)
commitf560069bc59e155c3078ba5482ce69ded68849df (patch)
tree06678b86934aeb1c167ef7ea9308a2d9452132b1
parent12f6c308d53509dcb11e309604457d21d60438db (diff)
downloadgit-f560069bc59e155c3078ba5482ce69ded68849df.zip
git-f560069bc59e155c3078ba5482ce69ded68849df.tar.gz
git-f560069bc59e155c3078ba5482ce69ded68849df.tar.bz2
annotate: Support annotation of files on other revisions.
This is a bug fix, and cleans up one or two other things spotted during the course of tracking down the main bug here. Also, the test-suite is updated to reflect this case. Signed-off-by: Ryan Anderson <ryan@michonline.com> (cherry picked from 2f7554b4db3ab2c2d3866b160245c91c9236fc9a commit) Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t8001-annotate.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 2496397..70e2ad2 100755
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -6,4 +6,10 @@ test_description='git-annotate'
PROG='git annotate'
. ../annotate-tests.sh
+test_expect_success \
+ 'Annotating an old revision works' \
+ '[ $(git annotate file master | awk "{print \$3}" | grep -c "^A$") == 2 ] && \
+ [ $(git annotate file master | awk "{print \$3}" | grep -c "^B$") == 2 ]'
+
+
test_done