git-svn: just name the default svn-remote "svn" instead of "git-svn"

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 6d243f84887735c0ad82fe3a3134c04950629662..eebb84974c098688265b174d5eed1e7f749484f6 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -30,17 +30,19 @@ test_expect_success 'initialize repo' "
 test_expect_success 'init and fetch --follow-parent a moved directory' "
        git-svn init -i thunk $svnrepo/thunk &&
        git-svn fetch --follow-parent -i thunk &&
-       test \"\`git-rev-parse --verify refs/remotes/trunk\`\" \
+       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
+                 sed -n -e '3p'\`\" = goodbye &&
+       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-repo-config svn-remote.git-svn.url $svnrepo &&
-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config svn-remote.svn.url $svnrepo &&
+        git-repo-config --add svn-remote.svn.fetch \
           trunk:refs/remotes/svn/trunk &&
-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config --add svn-remote.svn.fetch \
           thunk:refs/remotes/svn/thunk &&
         git-svn fetch --follow-parent -i svn/thunk &&
        test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
@@ -52,7 +54,7 @@ test_expect_success 'init and fetch from one svn-remote' "
 test_expect_success 'follow deleted parent' "
         svn cp -m 'resurrecting trunk as junk' \
                -r2 $svnrepo/trunk $svnrepo/junk &&
-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config --add svn-remote.svn.fetch \
           junk:refs/remotes/svn/junk &&
         git-svn fetch --follow-parent -i svn/thunk &&
         git-svn fetch -i svn/junk --follow-parent &&
@@ -93,17 +95,17 @@ test_expect_success 'follow higher-level parent' "
         "
 
 test_expect_success 'follow deleted directory' "
-       svn mv -m 'bye!' $svnrepo/glob/blob/hi $svnrepo/glob/blob/bye&&
+       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 fetch -i glob &&
-       test \"\`git cat-file blob refs/remotes/glob~1:blob/bye\`\" = hi &&
-       test -z \"\`git ls-tree -z refs/remotes/glob\`\"
+       test \"\`git cat-file blob refs/remotes/glob:blob/bye\`\" = hi &&
+       test \"\`git ls-tree refs/remotes/glob | wc -l \`\" -eq 1
        "
 
 # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
 # in trunk/subversion/bindings/swig/perl
-test_expect_success '' "
+test_expect_success 'follow-parent avoids deleting relevant info' "
        mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
        for i in a b c ; do \
          echo \$i > import/trunk/subversion/bindings/swig/perl/\$i.pm &&
@@ -132,6 +134,28 @@ test_expect_success '' "
             \"\`git ls-tree --name-only r9270-t\`\"
        "
 
+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 \
+         $svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t &&
+       git-svn fetch -i r9270-d --follow-parent &&
+       test \`git rev-list r9270-d | wc -l\` -eq 3 &&
+       test \"\`git ls-tree --name-only r9270-t\`\" = \
+            \"\`git ls-tree --name-only r9270-d\`\" &&
+       test \"\`git rev-parse r9270-t\`\" = \
+            \"\`git rev-parse r9270-d~1\`\"
+       "
+
+test_expect_success "multi-fetch continues to work" "
+       git-svn multi-fetch --follow-parent
+       "
+
+test_expect_success "multi-fetch works off a 'clean' repository" "
+       rm -r $GIT_DIR/svn $GIT_DIR/refs/remotes $GIT_DIR/logs &&
+       mkdir $GIT_DIR/svn &&
+       git-svn multi-fetch --follow-parent
+       "
+
 test_debug 'gitk --all &'
 
 test_done