Merge branch 'pb/gitweb-tagcloud' into pb/gitweb

diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index 69e96878fe0bb2d29567e1b9d5f15dd6b855085c..d8582b1aa5d178778623bfb4386a66f58e165c17 100755 (executable)
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (c) 2007 Eric Wong
-test_description='git-svn globbing refspecs'
+test_description='git svn globbing refspecs'
 . ./lib-git-svn.sh
 
 cat > expect.end <<EOF
@@ -46,14 +46,15 @@ test_expect_success 'test refspec globbing' '
                         "branches/*/src/a:refs/remotes/branches/*" &&
        git config --add svn-remote.svn.tags\
                         "tags/*/src/a:refs/remotes/tags/*" &&
-       git-svn multi-fetch &&
+       git svn multi-fetch &&
        git log --pretty=oneline refs/remotes/tags/end | \
            sed -e "s/^.\{41\}//" > output.end &&
        test_cmp expect.end output.end &&
        test "`git rev-parse refs/remotes/tags/end~1`" = \
                "`git rev-parse refs/remotes/branches/start`" &&
        test "`git rev-parse refs/remotes/branches/start~2`" = \
-               "`git rev-parse refs/remotes/trunk`"
+               "`git rev-parse refs/remotes/trunk`" &&
+       test_must_fail git rev-parse refs/remotes/tags/end@3
        '
 
 echo try to try > expect.two
@@ -73,7 +74,7 @@ test_expect_success 'test left-hand-side only globbing' '
                poke tags/end/src/b/readme &&
                svn commit -m "try to try"
        ) &&
-       git-svn fetch two &&
+       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` = \
@@ -85,8 +86,8 @@ test_expect_success 'test left-hand-side only globbing' '
        test_cmp expect.two output.two
        '
 
-echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" \
-     > expect.three
+echo "Only one set of wildcard directories" \
+     "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three
 echo "" >> expect.three
 
 test_expect_success 'test disallow multi-globs' '
@@ -94,7 +95,7 @@ test_expect_success 'test disallow multi-globs' '
        git config --add svn-remote.three.fetch \
                         trunk:refs/remotes/three/trunk &&
        git config --add svn-remote.three.branches \
-                        "branches/*/*:refs/remotes/three/branches/*" &&
+                        "branches/*/t/*:refs/remotes/three/branches/*" &&
        git config --add svn-remote.three.tags \
                         "tags/*/*:refs/remotes/three/tags/*" &&
        (
@@ -103,7 +104,7 @@ test_expect_success 'test disallow multi-globs' '
                poke tags/end/src/b/readme &&
                svn commit -m "try to try"
        ) &&
-       test_must_fail git-svn fetch three 2> stderr.three &&
+       test_must_fail git svn fetch three 2> stderr.three &&
        test_cmp expect.three stderr.three
        '