Merge branch 'maint'

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index d9b553ad55b1f7024af0689a450a9c6c65dcb034..acad16a6f0f9b3b45b4766474e15ee5019ec2ce2 100755 (executable)
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (c) 2006 Eric Wong
-test_description='git-svn metadata migrations from previous versions'
+test_description='git svn metadata migrations from previous versions'
 . ./lib-git-svn.sh
 
 test_expect_success 'setup old-looking metadata' '
@@ -14,34 +14,34 @@ test_expect_success 'setup old-looking metadata' '
                done && \
                svn import -m test . "$svnrepo"
                cd .. &&
-       git-svn init "$svnrepo" &&
-       git-svn fetch &&
+       git svn init "$svnrepo" &&
+       git svn fetch &&
        mv "$GIT_DIR"/svn/* "$GIT_DIR"/ &&
        mv "$GIT_DIR"/svn/.metadata "$GIT_DIR"/ &&
        rmdir "$GIT_DIR"/svn &&
-       git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
-       git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
-       git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
+       git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} &&
+       git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} &&
+       git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
        '
 
 head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
 test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
 
-test_expect_success 'initialize old-style (v0) git-svn layout' '
+test_expect_success 'initialize old-style (v0) git svn layout' '
        mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
        echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
        echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
-       git-svn migrate &&
-       ! test -d "$GIT_DIR"/git-svn &&
-       git rev-parse --verify refs/remotes/git-svn^0 &&
+       git svn migrate &&
+       ! test -d "$GIT_DIR"/git svn &&
+       git rev-parse --verify refs/${remotes_git_svn}^0 &&
        git rev-parse --verify refs/remotes/svn^0 &&
        test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
        test `git config --get svn-remote.svn.fetch` = \
-             ":refs/remotes/git-svn"
+             ":refs/${remotes_git_svn}"
        '
 
 test_expect_success 'initialize a multi-repository repo' '
-       git-svn init "$svnrepo" -T trunk -t tags -b branches &&
+       git svn init "$svnrepo" -T trunk -t tags -b branches &&
        git config --get-all svn-remote.svn.fetch > fetch.out &&
        grep "^trunk:refs/remotes/trunk$" fetch.out &&
        test -n "`git config --get svn-remote.svn.branches \
@@ -61,7 +61,7 @@ test_expect_success 'initialize a multi-repository repo' '
 
 # refs should all be different, but the trees should all be the same:
 test_expect_success 'multi-fetch works on partial urls + paths' "
-       git-svn multi-fetch &&
+       git svn multi-fetch &&
        for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
                git rev-parse --verify refs/remotes/\$i^0 >> refs.out || exit 1;
            done &&
@@ -85,7 +85,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
                ( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
                echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
        done &&
-       git-svn migrate --minimize &&
+       git svn migrate --minimize &&
        test -z "`git config -l |grep -v "^svn-remote\.git-svn\."`" &&
        git config --get-all svn-remote.svn.fetch > fetch.out &&
        grep "^trunk:refs/remotes/trunk$" fetch.out &&
@@ -94,11 +94,11 @@ test_expect_success 'migrate --minimize on old inited layout' '
        grep "^tags/0\.1:refs/remotes/tags/0\.1$" fetch.out &&
        grep "^tags/0\.2:refs/remotes/tags/0\.2$" fetch.out &&
        grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out
-       grep "^:refs/remotes/git-svn" fetch.out
+       grep "^:refs/${remotes_git_svn}" fetch.out
        '
 
 test_expect_success  ".rev_db auto-converted to .rev_map.UUID" '
-       git-svn fetch -i trunk &&
+       git svn fetch -i trunk &&
        test -z "$(ls "$GIT_DIR"/svn/trunk/.rev_db.* 2>/dev/null)" &&
        expect="$(ls "$GIT_DIR"/svn/trunk/.rev_map.*)" &&
        test -n "$expect" &&
@@ -106,7 +106,7 @@ test_expect_success  ".rev_db auto-converted to .rev_map.UUID" '
        convert_to_rev_db "$expect" "$rev_db" &&
        rm -f "$expect" &&
        test -f "$rev_db" &&
-       git-svn fetch -i trunk &&
+       git svn fetch -i trunk &&
        test -z "$(ls "$GIT_DIR"/svn/trunk/.rev_db.* 2>/dev/null)" &&
        test ! -e "$GIT_DIR"/svn/trunk/.rev_db &&
        test -f "$expect"