Merge branch 'fl/cvsserver'

diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index 47cccdfd0e6dbd69c000a3645bffac4fdc207378..db4344cc84395fcecee2010320f7fc46101d75a6 100755 (executable)
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -23,14 +23,19 @@ test_expect_success 'test refspec globbing' "
                svn commit -m 'start a new branch' &&
                svn up &&
                echo 'hi' >> branches/start/src/b/readme &&
+               poke branches/start/src/b/readme &&
                echo 'hey' >> branches/start/src/a/readme &&
+               poke branches/start/src/a/readme &&
                svn commit -m 'hi' &&
                svn up &&
                svn cp branches/start tags/end &&
                echo 'bye' >> tags/end/src/b/readme &&
+               poke tags/end/src/b/readme &&
                echo 'aye' >> tags/end/src/a/readme &&
+               poke tags/end/src/a/readme &&
                svn commit -m 'the end' &&
                echo 'byebye' >> tags/end/src/b/readme &&
+               poke tags/end/src/b/readme &&
                svn commit -m 'nothing to see here'
                cd .. &&
        git config --add svn-remote.svn.url $svnrepo &&
@@ -50,4 +55,32 @@ test_expect_success 'test refspec globbing' "
                \"\`git rev-parse refs/remotes/trunk\`\"
        "
 
+echo try to try > expect.two
+echo nothing to see here >> expect.two
+cat expect.end >> expect.two
+
+test_expect_success 'test left-hand-side only globbing' "
+       git config --add svn-remote.two.url $svnrepo &&
+       git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
+       git config --add svn-remote.two.branches \
+                        'branches/*:refs/remotes/two/branches/*' &&
+       git config --add svn-remote.two.tags \
+                        'tags/*:refs/remotes/two/tags/*' &&
+       cd tmp &&
+               echo 'try try' >> tags/end/src/b/readme &&
+               poke tags/end/src/b/readme &&
+               svn commit -m 'try to try'
+               cd .. &&
+       git-svn fetch two &&
+       test \`git rev-list refs/remotes/two/tags/end | wc -l\` -eq 6 &&
+       test \`git rev-list refs/remotes/two/branches/start | wc -l\` -eq 3 &&
+       test \`git rev-parse refs/remotes/two/branches/start~2\` = \
+            \`git rev-parse refs/remotes/two/trunk\` &&
+       test \`git rev-parse refs/remotes/two/tags/end~3\` = \
+            \`git rev-parse refs/remotes/two/branches/start\` &&
+       git log --pretty=oneline refs/remotes/two/tags/end | \
+           sed -e 's/^.\{41\}//' > output.two &&
+       cmp expect.two output.two
+       "
+
 test_done