git-svn: fetch tracks initial change with --follow-parent

[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 0f4e7362714b548cf67339f2cc4711da4d1c3b6f..dcec16bda236ecad6c8c3bfa2679615d5f6e3fc7 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -105,7 +105,7 @@ test_expect_success 'follow deleted directory' "
 
 # 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 &&
@@ -134,6 +134,18 @@ 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_debug 'gitk --all &'
 
 test_done