X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9100-git-svn-basic.sh;h=614cf50d195bb3b055fd8166d425eeffa7106509;hb=d794d9e70ebb8c767b04f25c03290ef305cd31ab;hp=eb628fe07543d07812525942cba11b8133f2e000;hpb=27ebd6e0443bdd795869f598ecebc9eadd64a26c;p=git.git

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index eb628fe07..614cf50d1 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -86,10 +86,10 @@ test_expect_failure "$name" "
 	rm -f '$GIT_DIR'/index &&
 	git checkout -f -b mybranch3 remotes/git-svn &&
 	rm bar/zzz &&
-	git-update-index --remove bar/zzz &&
+	git update-index --remove bar/zzz &&
 	mkdir bar/zzz &&
 	echo yyy > bar/zzz/yyy &&
-	git-update-index --add bar/zzz/yyy &&
+	git update-index --add bar/zzz/yyy &&
 	git commit -m '$name' &&
 	git-svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch3" || true
@@ -191,8 +191,8 @@ GIT_SVN_ID=alt
 export GIT_SVN_ID
 test_expect_success "$name" \
     "git-svn init $svnrepo && git-svn fetch &&
-     git-rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
-     git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
+     git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
+     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
      git diff a b"
 
 name='check imported tree checksums expected tree checksums'
@@ -214,7 +214,7 @@ EOF
 test_expect_success "$name" "git diff a expected"
 
 test_expect_failure 'exit if remote refs are ambigious' "
-        git-config --add svn-remote.svn.fetch \
+        git config --add svn-remote.svn.fetch \
                               bar:refs/remotes/git-svn &&
         git-svn migrate
         "
@@ -222,14 +222,14 @@ test_expect_failure 'exit if remote refs are ambigious' "
 test_expect_failure 'exit if init-ing a would clobber a URL' "
         svnadmin create ${PWD}/svnrepo2 &&
         svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
-        git-config --unset svn-remote.svn.fetch \
+        git config --unset svn-remote.svn.fetch \
                                 '^bar:refs/remotes/git-svn$' &&
         git-svn init ${svnrepo}2/bar
         "
 
 test_expect_success \
   'init allows us to connect to another directory in the same repo' "
-        git-svn init -i bar $svnrepo/bar &&
+        git-svn init --minimize-url -i bar $svnrepo/bar &&
         git config --get svn-remote.svn.fetch \
                               '^bar:refs/remotes/bar$' &&
         git config --get svn-remote.svn.fetch \