commit: drop duplicated parents

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 00a74ee7384e4b824c9faf9e6d7891e4f28c775a..655f88270b27b637b6d4b7d3fdb3af76f525064f 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -36,7 +36,7 @@ test_expect_success 'setup cvsroot' 'cvs init'
 
 test_expect_success 'setup a cvs module' '
 
-       mkdir $CVSROOT/module &&
+       mkdir "$CVSROOT/module" &&
        cvs co -d module-cvs module &&
        cd module-cvs &&
        cat <<EOF >o_fortuna &&
@@ -69,7 +69,7 @@ EOF
 test_expect_success 'import a trivial module' '
 
        git cvsimport -a -z 0 -C module-git module &&
-       git diff module-cvs/o_fortuna module-git/o_fortuna
+       test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
 '
 
@@ -110,7 +110,7 @@ test_expect_success 'update git module' '
        git cvsimport -a -z 0 module &&
        git merge origin &&
        cd .. &&
-       git diff module-cvs/o_fortuna module-git/o_fortuna
+       test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
 '
 
@@ -131,7 +131,7 @@ test_expect_success 'cvsimport.module config works' '
                git cvsimport -a -z0 &&
                git merge origin &&
        cd .. &&
-       git diff module-cvs/tick module-git/tick
+       test_cmp module-cvs/tick module-git/tick
 
 '
 
@@ -142,7 +142,7 @@ test_expect_success 'import from a CVS working tree' '
                git cvsimport -a -z0 &&
                echo 1 >expect &&
                git log -1 --pretty=format:%s%n >actual &&
-               git diff actual expect &&
+               test_cmp actual expect &&
        cd ..
 
 '