Whip post 1.5.3.3 maintenance series into shape.

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index bd4f366e8687ebfeb53408c000a32ca1eda7334b..d8f9cab35dcff89469f1974dcc7130e3d38f471e 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -28,33 +28,33 @@ test_expect_success 'initialize repo' "
        "
 
 test_expect_success 'init and fetch a moved directory' "
-       git-svn init -i thunk $svnrepo/thunk &&
+       git-svn init --minimize-url -i thunk $svnrepo/thunk &&
        git-svn fetch -i thunk &&
-       test \"\`git-rev-parse --verify refs/remotes/thunk@2\`\" \
-           = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
-        test \"\`git-cat-file blob refs/remotes/thunk:readme |\
+       test \"\`git rev-parse --verify refs/remotes/thunk@2\`\" \
+           = \"\`git rev-parse --verify refs/remotes/thunk~1\`\" &&
+        test \"\`git cat-file blob refs/remotes/thunk:readme |\
                  sed -n -e '3p'\`\" = goodbye &&
-       test -z \"\`git-config --get svn-remote.svn.fetch \
+       test -z \"\`git config --get svn-remote.svn.fetch \
                 '^trunk:refs/remotes/thunk@2$'\`\"
        "
 
 test_expect_success 'init and fetch from one svn-remote' "
-        git-config svn-remote.svn.url $svnrepo &&
-        git-config --add svn-remote.svn.fetch \
+        git config svn-remote.svn.url $svnrepo &&
+        git config --add svn-remote.svn.fetch \
           trunk:refs/remotes/svn/trunk &&
-        git-config --add svn-remote.svn.fetch \
+        git config --add svn-remote.svn.fetch \
           thunk:refs/remotes/svn/thunk &&
         git-svn fetch -i svn/thunk &&
-       test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
-           = \"\`git-rev-parse --verify refs/remotes/svn/thunk~1\`\" &&
-        test \"\`git-cat-file blob refs/remotes/svn/thunk:readme |\
+       test \"\`git rev-parse --verify refs/remotes/svn/trunk\`\" \
+           = \"\`git rev-parse --verify refs/remotes/svn/thunk~1\`\" &&
+        test \"\`git cat-file blob refs/remotes/svn/thunk:readme |\
                  sed -n -e '3p'\`\" = goodbye
         "
 
 test_expect_success 'follow deleted parent' "
         svn cp -m 'resurrecting trunk as junk' \
                -r2 $svnrepo/trunk $svnrepo/junk &&
-        git-config --add svn-remote.svn.fetch \
+        git config --add svn-remote.svn.fetch \
           junk:refs/remotes/svn/junk &&
         git-svn fetch -i svn/thunk &&
         git-svn fetch -i svn/junk &&
@@ -68,15 +68,16 @@ test_expect_success 'follow larger parent' "
         echo hi > import/trunk/thunk/bump/thud/file &&
         svn import -m 'import a larger parent' import $svnrepo/larger-parent &&
         svn cp -m 'hi' $svnrepo/larger-parent $svnrepo/another-larger &&
-        git-svn init -i larger $svnrepo/another-larger/trunk/thunk/bump/thud &&
+        git-svn init --minimize-url -i larger \
+          $svnrepo/another-larger/trunk/thunk/bump/thud &&
         git-svn fetch -i larger &&
-        git-rev-parse --verify refs/remotes/larger &&
-        git-rev-parse --verify \
+        git rev-parse --verify refs/remotes/larger &&
+        git rev-parse --verify \
            refs/remotes/larger-parent/trunk/thunk/bump/thud &&
-        test \"\`git-merge-base \
+        test \"\`git merge-base \
                  refs/remotes/larger-parent/trunk/thunk/bump/thud \
                  refs/remotes/larger\`\" = \
-             \"\`git-rev-parse refs/remotes/larger\`\"
+             \"\`git rev-parse refs/remotes/larger\`\"
         true
         "
 
@@ -90,14 +91,14 @@ test_expect_success 'follow higher-level parent' "
                 cd ..
         svn mkdir -m 'new glob at top level' $svnrepo/glob &&
         svn mv -m 'move blob down a level' $svnrepo/blob $svnrepo/glob/blob &&
-        git-svn init -i blob $svnrepo/glob/blob &&
+        git-svn init --minimize-url -i blob $svnrepo/glob/blob &&
         git-svn fetch -i blob
         "
 
 test_expect_success 'follow deleted directory' "
        svn mv -m 'bye!' $svnrepo/glob/blob/hi $svnrepo/glob/blob/bye &&
        svn rm -m 'remove glob' $svnrepo/glob &&
-       git-svn init -i glob $svnrepo/glob &&
+       git-svn init --minimize-url -i glob $svnrepo/glob &&
        git-svn fetch -i glob &&
        test \"\`git cat-file blob refs/remotes/glob:blob/bye\`\" = hi &&
        test \"\`git ls-tree refs/remotes/glob | wc -l \`\" -eq 1
@@ -127,7 +128,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' "
          poke native/t/c.t &&
          svn commit -m 'reorg test' &&
        cd .. &&
-       git-svn init -i r9270-t \
+       git-svn init --minimize-url -i r9270-t \
          $svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t &&
        git-svn fetch -i r9270-t &&
        test \`git rev-list r9270-t | wc -l\` -eq 2 &&
@@ -137,7 +138,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' "
 
 test_expect_success "track initial change if it was only made to parent" "
        svn cp -m 'wheee!' $svnrepo/r9270/trunk $svnrepo/r9270/drunk &&
-       git-svn init -i r9270-d \
+       git-svn init --minimize-url -i r9270-d \
          $svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t &&
        git-svn fetch -i r9270-d &&
        test \`git rev-list r9270-d | wc -l\` -eq 3 &&