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>
Eric Wong committed
Feb 3, 2007 at 12:49 UTC
9fa00b655cfd67bf344668a0d913f90ec9a8141d
4 files changed
+16
-16
git-svn.perl
+1
-1
@@ -10,7 +10,7 @@ $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10
$VERSION = '@@GIT_VERSION@@';
11
12
$ENV{GIT_DIR} ||= '.git';
13
-$Git::SVN::default_repo_id = 'git-svn';
13
+$Git::SVN::default_repo_id = 'svn';
14
$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
15
16
$Git::SVN::Log::TZ = $ENV{TZ};
t/t9100-git-svn-basic.sh
+4
-4
@@ -214,7 +214,7 @@ EOF
214
test_expect_success "$name" "diff -u a expected"
215
216
test_expect_failure 'exit if remote refs are ambigious' "
217
- git-repo-config --add svn-remote.git-svn.fetch \
217
+ git-repo-config --add svn-remote.svn.fetch \
218
bar:refs/remotes/git-svn &&
219
git-svn migrate
220
"
@@ -222,7 +222,7 @@ test_expect_failure 'exit if remote refs are ambigious' "
222
test_expect_failure 'exit if init-ing a would clobber a URL' "
223
svnadmin create ${PWD}/svnrepo2 &&
224
svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
225
- git-repo-config --unset svn-remote.git-svn.fetch \
225
+ git-repo-config --unset svn-remote.svn.fetch \
226
'^bar:refs/remotes/git-svn$' &&
227
git-svn init ${svnrepo}2/bar
228
"
@@ -230,9 +230,9 @@ test_expect_failure 'exit if init-ing a would clobber a URL' "
230
test_expect_success \
231
'init allows us to connect to another directory in the same repo' "
232
git-svn init -i bar $svnrepo/bar &&
233
- git repo-config --get svn-remote.git-svn.fetch \
233
+ git repo-config --get svn-remote.svn.fetch \
234
'^bar:refs/remotes/bar$' &&
235
- git repo-config --get svn-remote.git-svn.fetch \
235
+ git repo-config --get svn-remote.svn.fetch \
236
'^:refs/remotes/git-svn$'
237
"
238
t/t9104-git-svn-follow-parent.sh
+5
-5
@@ -34,15 +34,15 @@ test_expect_success 'init and fetch --follow-parent a moved directory' "
34
= \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
35
test \"\`git-cat-file blob refs/remotes/thunk:readme |\
36
sed -n -e '3p'\`\" = goodbye &&
37
- test -z \"\`git-config --get svn-remote.git-svn.fetch \
37
+ test -z \"\`git-config --get svn-remote.svn.fetch \
38
'^trunk:refs/remotes/thunk@2$'\`\"
39
"
40
41
test_expect_success 'init and fetch from one svn-remote' "
42
- git-repo-config svn-remote.git-svn.url $svnrepo &&
43
- git-repo-config --add svn-remote.git-svn.fetch \
42
+ git-repo-config svn-remote.svn.url $svnrepo &&
43
+ git-repo-config --add svn-remote.svn.fetch \
44
trunk:refs/remotes/svn/trunk &&
45
- git-repo-config --add svn-remote.git-svn.fetch \
45
+ git-repo-config --add svn-remote.svn.fetch \
46
thunk:refs/remotes/svn/thunk &&
47
git-svn fetch --follow-parent -i svn/thunk &&
48
test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
@@ -54,7 +54,7 @@ test_expect_success 'init and fetch from one svn-remote' "
54
test_expect_success 'follow deleted parent' "
55
svn cp -m 'resurrecting trunk as junk' \
56
-r2 $svnrepo/trunk $svnrepo/junk &&
57
- git-repo-config --add svn-remote.git-svn.fetch \
57
+ git-repo-config --add svn-remote.svn.fetch \
58
junk:refs/remotes/svn/junk &&
59
git-svn fetch --follow-parent -i svn/thunk &&
60
git-svn fetch -i svn/junk --follow-parent &&
t/t9107-git-svn-migrate.sh
+6
-6
@@ -34,14 +34,14 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
34
! test -d $GIT_DIR/git-svn &&
35
git-rev-parse --verify refs/remotes/git-svn^0 &&
36
git-rev-parse --verify refs/remotes/svn^0 &&
37
- test \`git repo-config --get svn-remote.git-svn.url\` = '$svnrepo' &&
38
- test \`git repo-config --get svn-remote.git-svn.fetch\` = \
37
+ test \`git repo-config --get svn-remote.svn.url\` = '$svnrepo' &&
38
+ test \`git repo-config --get svn-remote.svn.fetch\` = \
39
':refs/remotes/git-svn'
40
"
41
42
test_expect_success 'initialize a multi-repository repo' "
43
git-svn multi-init $svnrepo -T trunk -t tags -b branches &&
44
- git-repo-config --get-all svn-remote.git-svn.fetch > fetch.out &&
44
+ git-repo-config --get-all svn-remote.svn.fetch > fetch.out &&
45
grep '^trunk:refs/remotes/trunk$' fetch.out &&
46
grep '^branches/a:refs/remotes/a$' fetch.out &&
47
grep '^branches/b:refs/remotes/b$' fetch.out &&
@@ -65,8 +65,8 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
65
"
66
67
test_expect_success 'migrate --minimize on old multi-inited layout' "
68
- git repo-config --unset-all svn-remote.git-svn.fetch &&
69
- git repo-config --unset-all svn-remote.git-svn.url &&
68
+ git repo-config --unset-all svn-remote.svn.fetch &&
69
+ git repo-config --unset-all svn-remote.svn.url &&
70
rm -rf $GIT_DIR/svn &&
71
for i in \`cat fetch.out\`; do
72
path=\`expr \$i : '\\([^:]*\\):.*$'\`
@@ -78,7 +78,7 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
78
done &&
79
git-svn migrate --minimize &&
80
test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
81
- git-repo-config --get-all svn-remote.git-svn.fetch > fetch.out &&
81
+ git-repo-config --get-all svn-remote.svn.fetch > fetch.out &&
82
grep '^trunk:refs/remotes/trunk$' fetch.out &&
83
grep '^branches/a:refs/remotes/a$' fetch.out &&
84
grep '^branches/b:refs/remotes/b$' fetch.out &&