git-svn: --follow-parent tracks multi-parent paths

[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 eebb84974c098688265b174d5eed1e7f749484f6..f5b7e5efe018a548ef54f9a6684d9fb584a89fb9 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -146,6 +146,13 @@ 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 --follow-parent &&
+       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
        "