t3412: use log|name-rev instead of log --graph

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 655f88270b27b637b6d4b7d3fdb3af76f525064f..d2379e7f62a4da76791e65dbc2c70f4dfe14ff3b 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-test_description='git-cvsimport basic tests'
+test_description='git cvsimport basic tests'
 . ./test-lib.sh
 
 CVSROOT=$(pwd)/cvsroot
 export CVSROOT
+unset CVS_SERVER
 # for clean cvsps cache
 HOME=$(pwd)
 export HOME
@@ -18,7 +19,7 @@ fi
 
 cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
 case "$cvsps_version" in
-2.1)
+2.1 | 2.2*)
        ;;
 '')
        say 'skipping cvsimport tests, cvsps not found'
@@ -26,7 +27,7 @@ case "$cvsps_version" in
        exit
        ;;
 *)
-       say 'skipping cvsimport tests, cvsps too old'
+       say 'skipping cvsimport tests, unsupported cvsps version'
        test_done
        exit
        ;;