aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-05 00:57:35 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-05 00:57:35 -0700
commit7ceacdffc5c05f9a763b4cb6ea7cb528004643c3 (patch)
tree309b7e02e247486812f49ab83b34646b7508b51d /t
parentf88d225feb117f0429540da90b2552e198fa2e82 (diff)
downloadgit-7ceacdffc5c05f9a763b4cb6ea7cb528004643c3.tar.gz
git-7ceacdffc5c05f9a763b4cb6ea7cb528004643c3.tar.xz
"blame -c" should be compatible with "annotate"
There is no reason to have a separate variable cmd_is_annotate; OUTPUT_ANNOTATE_COMPAT option is supposed to produce the compatibility output, and we should produce the same output even when the command was not invoked as "annotate" but as "blame -c". Noticed by Pasky. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t9400-git-cvsserver-server.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 4b91f8d4c..c1850d292 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -488,4 +488,17 @@ test_expect_success 'cvs co -c (shows module database)' '
! grep -v "^master[ ]\+master$" < out
'
+#------------
+# CVS ANNOTATE
+#------------
+
+cd "$WORKDIR"
+test_expect_success 'cvs annotate' '
+ cd cvswork &&
+ GIT_CONFIG="$git_config" cvs annotate merge >../out &&
+ sed -e "s/ .*//" ../out >../actual &&
+ for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
+ test_cmp ../expect ../actual
+'
+
test_done