git-svn: just name the default svn-remote "svn" instead of "git-svn"

It can be confusing and redundant, since historically the
default remote ref (not remote itself) has been "git-svn", too.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff --git a/git-svn.perl b/git-svn.perl
index 8c24012e7bda810f40c80f372f28d10a55423c22..66b4c20fd9567a2b91dc54ebd95e7aaf4f76a8f3 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -10,7 +10,7 @@
 $VERSION = '@@GIT_VERSION@@';
 
 $ENV{GIT_DIR} ||= '.git';
 $VERSION = '@@GIT_VERSION@@';
 
 $ENV{GIT_DIR} ||= '.git';

-$Git::SVN::default_repo_id = 'git-svn';
+$Git::SVN::default_repo_id = 'svn';

 $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
 
 $Git::SVN::Log::TZ = $ENV{TZ};
 $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
 
 $Git::SVN::Log::TZ = $ENV{TZ};

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 3dc4de2fad6a3a1058c721ce5bd799962dd0bf64..8b6c8ffe10bdeaf7bc82af6d406d41c714231eea 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -214,7 +214,7 @@ EOF
 test_expect_success "$name" "diff -u a expected"
 
 test_expect_failure 'exit if remote refs are ambigious' "
 test_expect_success "$name" "diff -u a expected"
 
 test_expect_failure 'exit if remote refs are ambigious' "

-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config --add svn-remote.svn.fetch \

                               bar:refs/remotes/git-svn &&
         git-svn migrate
         "
                               bar:refs/remotes/git-svn &&
         git-svn migrate
         "


@@ -222,7 +222,7 @@ test_expect_failure 'exit if remote refs are ambigious' "
 test_expect_failure 'exit if init-ing a would clobber a URL' "
         svnadmin create ${PWD}/svnrepo2 &&
         svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
 test_expect_failure 'exit if init-ing a would clobber a URL' "
         svnadmin create ${PWD}/svnrepo2 &&
         svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&

-        git-repo-config --unset svn-remote.git-svn.fetch \
+        git-repo-config --unset svn-remote.svn.fetch \

                                 '^bar:refs/remotes/git-svn$' &&
         git-svn init ${svnrepo}2/bar
         "
                                 '^bar:refs/remotes/git-svn$' &&
         git-svn init ${svnrepo}2/bar
         "


@@ -230,9 +230,9 @@ test_expect_failure 'exit if init-ing a would clobber a URL' "
 test_expect_success \
   'init allows us to connect to another directory in the same repo' "
         git-svn init -i bar $svnrepo/bar &&
 test_expect_success \
   'init allows us to connect to another directory in the same repo' "
         git-svn init -i bar $svnrepo/bar &&

-        git repo-config --get svn-remote.git-svn.fetch \
+        git repo-config --get svn-remote.svn.fetch \

                               '^bar:refs/remotes/bar$' &&
                               '^bar:refs/remotes/bar$' &&

-        git repo-config --get svn-remote.git-svn.fetch \
+        git repo-config --get svn-remote.svn.fetch \

                               '^:refs/remotes/git-svn$'
         "
 
                               '^:refs/remotes/git-svn$'
         "
 

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 7c852c1d7f0f2a1f241f6a16024bbe841cefe56f..eebb84974c098688265b174d5eed1e7f749484f6 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -34,15 +34,15 @@ test_expect_success 'init and fetch --follow-parent a moved directory' "
            = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
         test \"\`git-cat-file blob refs/remotes/thunk:readme |\
                  sed -n -e '3p'\`\" = goodbye &&
            = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
         test \"\`git-cat-file blob refs/remotes/thunk:readme |\
                  sed -n -e '3p'\`\" = goodbye &&

-       test -z \"\`git-config --get svn-remote.git-svn.fetch \
+       test -z \"\`git-config --get svn-remote.svn.fetch \

                 '^trunk:refs/remotes/thunk@2$'\`\"
        "
 
 test_expect_success 'init and fetch from one svn-remote' "
                 '^trunk:refs/remotes/thunk@2$'\`\"
        "
 
 test_expect_success 'init and fetch from one svn-remote' "

-        git-repo-config svn-remote.git-svn.url $svnrepo &&
-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config svn-remote.svn.url $svnrepo &&
+        git-repo-config --add svn-remote.svn.fetch \

           trunk:refs/remotes/svn/trunk &&
           trunk:refs/remotes/svn/trunk &&

-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config --add svn-remote.svn.fetch \

           thunk:refs/remotes/svn/thunk &&
         git-svn fetch --follow-parent -i svn/thunk &&
        test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
           thunk:refs/remotes/svn/thunk &&
         git-svn fetch --follow-parent -i svn/thunk &&
        test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \


@@ -54,7 +54,7 @@ test_expect_success 'init and fetch from one svn-remote' "
 test_expect_success 'follow deleted parent' "
         svn cp -m 'resurrecting trunk as junk' \
                -r2 $svnrepo/trunk $svnrepo/junk &&
 test_expect_success 'follow deleted parent' "
         svn cp -m 'resurrecting trunk as junk' \
                -r2 $svnrepo/trunk $svnrepo/junk &&

-        git-repo-config --add svn-remote.git-svn.fetch \
+        git-repo-config --add svn-remote.svn.fetch \

           junk:refs/remotes/svn/junk &&
         git-svn fetch --follow-parent -i svn/thunk &&
         git-svn fetch -i svn/junk --follow-parent &&
           junk:refs/remotes/svn/junk &&
         git-svn fetch --follow-parent -i svn/thunk &&
         git-svn fetch -i svn/junk --follow-parent &&

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index f6d84ba7a5109f6fb3d88f789d75ed7448140a40..0fbfd264ec2e326b647ffd5715586f17bcd8696c 100755 (executable)
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -34,14 +34,14 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
        ! test -d $GIT_DIR/git-svn &&
        git-rev-parse --verify refs/remotes/git-svn^0 &&
        git-rev-parse --verify refs/remotes/svn^0 &&
        ! 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 repo-config --get svn-remote.git-svn.url\` = '$svnrepo' &&
-       test \`git repo-config --get svn-remote.git-svn.fetch\` = \
+       test \`git repo-config --get svn-remote.svn.url\` = '$svnrepo' &&
+       test \`git repo-config --get svn-remote.svn.fetch\` = \

              ':refs/remotes/git-svn'
        "
 
 test_expect_success 'initialize a multi-repository repo' "
        git-svn multi-init $svnrepo -T trunk -t tags -b branches &&
              ':refs/remotes/git-svn'
        "
 
 test_expect_success 'initialize a multi-repository repo' "
        git-svn multi-init $svnrepo -T trunk -t tags -b branches &&

-       git-repo-config --get-all svn-remote.git-svn.fetch > fetch.out &&
+       git-repo-config --get-all svn-remote.svn.fetch > fetch.out &&

        grep '^trunk:refs/remotes/trunk$' fetch.out &&
        grep '^branches/a:refs/remotes/a$' fetch.out &&
        grep '^branches/b:refs/remotes/b$' fetch.out &&
        grep '^trunk:refs/remotes/trunk$' fetch.out &&
        grep '^branches/a:refs/remotes/a$' fetch.out &&
        grep '^branches/b:refs/remotes/b$' fetch.out &&


@@ -65,8 +65,8 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
        "
 
 test_expect_success 'migrate --minimize on old multi-inited layout' "
        "
 
 test_expect_success 'migrate --minimize on old multi-inited layout' "

-       git repo-config --unset-all svn-remote.git-svn.fetch &&
-       git repo-config --unset-all svn-remote.git-svn.url &&
+       git repo-config --unset-all svn-remote.svn.fetch &&
+       git repo-config --unset-all svn-remote.svn.url &&

        rm -rf $GIT_DIR/svn &&
        for i in \`cat fetch.out\`; do
                path=\`expr \$i : '\\([^:]*\\):.*$'\`
        rm -rf $GIT_DIR/svn &&
        for i in \`cat fetch.out\`; do
                path=\`expr \$i : '\\([^:]*\\):.*$'\`


@@ -78,7 +78,7 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
        done &&
        git-svn migrate --minimize &&
        test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
        done &&
        git-svn migrate --minimize &&
        test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&

-       git-repo-config --get-all svn-remote.git-svn.fetch > fetch.out &&
+       git-repo-config --get-all svn-remote.svn.fetch > fetch.out &&

        grep '^trunk:refs/remotes/trunk$' fetch.out &&
        grep '^branches/a:refs/remotes/a$' fetch.out &&
        grep '^branches/b:refs/remotes/b$' fetch.out &&
        grep '^trunk:refs/remotes/trunk$' fetch.out &&
        grep '^branches/a:refs/remotes/a$' fetch.out &&
        grep '^branches/b:refs/remotes/b$' fetch.out &&