kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Eric Wong 2007-02-03 12:49:48 -08:00
parent 502c1bf629
commit 9fa00b655c
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-svn.perl
View File

@ -10,7 +10,7 @@ $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
$VERSION = '@@GIT_VERSION@@'; $VERSION = '@@GIT_VERSION@@';


$ENV{GIT_DIR} ||= '.git'; $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::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';


$Git::SVN::Log::TZ = $ENV{TZ}; $Git::SVN::Log::TZ = $ENV{TZ};

8
t/t9100-git-svn-basic.sh
View File

@ -214,7 +214,7 @@ EOF
test_expect_success "$name" "diff -u a expected" test_expect_success "$name" "diff -u a expected"


test_expect_failure 'exit if remote refs are ambigious' " 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 && bar:refs/remotes/git-svn &&
git-svn migrate 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' " test_expect_failure 'exit if init-ing a would clobber a URL' "
svnadmin create ${PWD}/svnrepo2 && svnadmin create ${PWD}/svnrepo2 &&
svn mkdir -m 'mkdir bar' ${svnrepo}2/bar && 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$' && '^bar:refs/remotes/git-svn$' &&
git-svn init ${svnrepo}2/bar 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 \ test_expect_success \
'init allows us to connect to another directory in the same repo' " 'init allows us to connect to another directory in the same repo' "
git-svn init -i bar $svnrepo/bar && 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$'
" "



10
t/t9104-git-svn-follow-parent.sh
View File

@ -34,15 +34,15 @@ test_expect_success 'init and fetch --follow-parent a moved directory' "
= \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" && = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
test \"\`git-cat-file blob refs/remotes/thunk:readme |\ test \"\`git-cat-file blob refs/remotes/thunk:readme |\
sed -n -e '3p'\`\" = goodbye && 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$'\`\" '^trunk:refs/remotes/thunk@2$'\`\"
" "


test_expect_success 'init and fetch from one svn-remote' " test_expect_success 'init and fetch from one svn-remote' "
git-repo-config svn-remote.git-svn.url $svnrepo && git-repo-config svn-remote.svn.url $svnrepo &&
git-repo-config --add svn-remote.git-svn.fetch \ 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 && thunk:refs/remotes/svn/thunk &&
git-svn fetch --follow-parent -i svn/thunk && git-svn fetch --follow-parent -i svn/thunk &&
test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \ 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' " test_expect_success 'follow deleted parent' "
svn cp -m 'resurrecting trunk as junk' \ svn cp -m 'resurrecting trunk as junk' \
-r2 $svnrepo/trunk $svnrepo/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 && junk:refs/remotes/svn/junk &&
git-svn fetch --follow-parent -i svn/thunk && git-svn fetch --follow-parent -i svn/thunk &&
git-svn fetch -i svn/junk --follow-parent && git-svn fetch -i svn/junk --follow-parent &&

12
t/t9107-git-svn-migrate.sh
View File

@ -34,14 +34,14 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
! test -d $GIT_DIR/git-svn && ! test -d $GIT_DIR/git-svn &&
git-rev-parse --verify refs/remotes/git-svn^0 && git-rev-parse --verify refs/remotes/git-svn^0 &&
git-rev-parse --verify refs/remotes/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.svn.url\` = '$svnrepo' &&
test \`git repo-config --get svn-remote.git-svn.fetch\` = \ test \`git repo-config --get svn-remote.svn.fetch\` = \
':refs/remotes/git-svn' ':refs/remotes/git-svn'
" "


test_expect_success 'initialize a multi-repository repo' " test_expect_success 'initialize a multi-repository repo' "
git-svn multi-init $svnrepo -T trunk -t tags -b branches && 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 '^trunk:refs/remotes/trunk$' fetch.out &&
grep '^branches/a:refs/remotes/a$' fetch.out && grep '^branches/a:refs/remotes/a$' fetch.out &&
grep '^branches/b:refs/remotes/b$' 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.svn.fetch &&
git repo-config --unset-all svn-remote.git-svn.url && git repo-config --unset-all svn-remote.svn.url &&
rm -rf $GIT_DIR/svn && rm -rf $GIT_DIR/svn &&
for i in \`cat fetch.out\`; do for i in \`cat fetch.out\`; do
path=\`expr \$i : '\\([^:]*\\):.*$'\` path=\`expr \$i : '\\([^:]*\\):.*$'\`
@ -78,7 +78,7 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
done && done &&
git-svn migrate --minimize && git-svn migrate --minimize &&
test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" && 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 '^trunk:refs/remotes/trunk$' fetch.out &&
grep '^branches/a:refs/remotes/a$' fetch.out && grep '^branches/a:refs/remotes/a$' fetch.out &&
grep '^branches/b:refs/remotes/b$' fetch.out && grep '^branches/b:refs/remotes/b$' fetch.out &&