Make git-rerere a builtin

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 450fee89973af5fa660b43202e8945b55e01cf6f..99ada71349c7eaa0536bba1d622f7f7ffa56110e 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -7,12 +7,20 @@ then
        exit
 fi
 
+perl -e 'use SVN::Core; $SVN::Core::VERSION gt "1.1.0" or die' >/dev/null 2>&1
+if test $? -ne 0
+then
+       test_expect_success 'Perl SVN libraries not found, skipping test' :
+       test_done
+       exit
+fi
+
 GIT_DIR=$PWD/.git
 GIT_SVN_DIR=$GIT_DIR/svn/git-svn
 SVN_TREE=$GIT_SVN_DIR/svn-tree
 
 svnadmin >/dev/null 2>&1
-if test $? != 1
+if test $? -ne 1
 then
     test_expect_success 'skipping git-svn tests, svnadmin not found' :
     test_done
@@ -20,7 +28,7 @@ then
 fi
 
 svn >/dev/null 2>&1
-if test $? != 1
+if test $? -ne 1
 then
     test_expect_success 'skipping git-svn tests, svn not found' :
     test_done
@@ -38,6 +46,6 @@ else
        svnadmin create "$svnrepo"
 fi
 
-svnrepo="file://$svnrepo/test-git-svn"
+svnrepo="file://$svnrepo"