Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / t / t9104-git-svn-follow-parent.sh

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 7c852c1d7f0f2a1f241f6a16024bbe841cefe56f..bd4f366e8687ebfeb53408c000a32ca1eda7334b 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Eric Wong
 #
 
-test_description='git-svn --follow-parent fetching'
+test_description='git-svn fetching'
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' "
@@ -27,24 +27,24 @@ test_expect_success 'initialize repo' "
        cd ..
        "
 
-test_expect_success 'init and fetch --follow-parent a moved directory' "
+test_expect_success 'init and fetch a moved directory' "
        git-svn init -i thunk $svnrepo/thunk &&
-       git-svn fetch --follow-parent -i 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 |\
                  sed -n -e '3p'\`\" = goodbye &&
-       test -z \"\`git-config --get svn-remote.git-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-repo-config svn-remote.git-svn.url $svnrepo &&
-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-config svn-remote.svn.url $svnrepo &&
+        git-config --add svn-remote.svn.fetch \
           trunk:refs/remotes/svn/trunk &&
-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-config --add svn-remote.svn.fetch \
           thunk:refs/remotes/svn/thunk &&
-        git-svn fetch --follow-parent -i 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 |\
@@ -54,10 +54,10 @@ 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-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 &&
+        git-svn fetch -i svn/thunk &&
+        git-svn fetch -i svn/junk &&
         test -z \"\`git diff svn/junk svn/trunk\`\" &&
         test \"\`git merge-base svn/junk svn/trunk\`\" \
            = \"\`git rev-parse svn/trunk\`\"
@@ -69,7 +69,7 @@ test_expect_success 'follow larger parent' "
         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 fetch -i larger --follow-parent &&
+        git-svn fetch -i larger &&
         git-rev-parse --verify refs/remotes/larger &&
         git-rev-parse --verify \
            refs/remotes/larger-parent/trunk/thunk/bump/thud &&
@@ -91,7 +91,7 @@ test_expect_success 'follow higher-level parent' "
         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 fetch -i blob --follow-parent
+        git-svn fetch -i blob
         "
 
 test_expect_success 'follow deleted directory' "
@@ -124,11 +124,12 @@ test_expect_success 'follow-parent avoids deleting relevant info' "
          svn mv t native/t &&
          for i in a b c; do svn mv \$i.pm native/\$i.pm; done &&
          echo z >> native/t/c.t &&
+         poke native/t/c.t &&
          svn commit -m 'reorg test' &&
        cd .. &&
        git-svn init -i r9270-t \
          $svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t &&
-       git-svn fetch -i r9270-t --follow-parent &&
+       git-svn fetch -i r9270-t &&
        test \`git rev-list r9270-t | wc -l\` -eq 2 &&
        test \"\`git ls-tree --name-only r9270-t~1\`\" = \
             \"\`git ls-tree --name-only r9270-t\`\"
@@ -138,7 +139,7 @@ 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 &&
+       git-svn fetch -i r9270-d &&
        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\`\" &&
@@ -146,14 +147,21 @@ test_expect_success "track initial change if it was only made to parent" "
             \"\`git rev-parse r9270-d~1\`\"
        "
 
+test_expect_success "track multi-parent paths" "
+       svn cp -m 'resurrect /glob' $svnrepo/r9270 $svnrepo/glob &&
+       git-svn multi-fetch &&
+       test \`git cat-file commit refs/remotes/glob | \
+              grep '^parent ' | wc -l\` -eq 2
+       "
+
 test_expect_success "multi-fetch continues to work" "
-       git-svn multi-fetch --follow-parent
+       git-svn multi-fetch
        "
 
 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
+       git-svn multi-fetch
        "
 
 test_debug 'gitk --all &'