t/t91XX git-svn tests: run "git svn" not "git-svn"
This replaces 'git-svn' with 'git svn' in the tests. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nanako Shiraishi committed
Sep 8, 2008 at 19:02 UTC
1364ff27dc5ecca4c1932d8fa09fe88a7c09fda0
27 files changed
+174
-174
t/lib-git-svn.sh
+3
-3
@@ -5,7 +5,7 @@ git_svn_id=git""-svn-id
5
6
if test -n "$NO_SVN_TESTS"
7
then
8
- test_expect_success 'skipping git-svn tests, NO_SVN_TESTS defined' :
8
+ test_expect_success 'skipping git svn tests, NO_SVN_TESTS defined' :
9
test_done
10
exit
11
fi
@@ -17,7 +17,7 @@ SVN_TREE=$GIT_SVN_DIR/svn-tree
17
svn >/dev/null 2>&1
18
if test $? -ne 1
19
then
20
- test_expect_success 'skipping git-svn tests, svn not found' :
20
+ test_expect_success 'skipping git svn tests, svn not found' :
21
test_done
22
exit
23
fi
@@ -91,7 +91,7 @@ start_httpd () {
91
mkdir "$GIT_DIR"/logs
92
93
cat > "$GIT_DIR/httpd.conf" <<EOF
94
-ServerName "git-svn test"
94
+ServerName "git svn test"
95
ServerRoot "$GIT_DIR"
96
DocumentRoot "$GIT_DIR"
97
PidFile "$GIT_DIR/httpd.pid"
t/t9100-git-svn-basic.sh
+24
-24
@@ -3,7 +3,7 @@
3
# Copyright (c) 2006 Eric Wong
4
#
5
6
-test_description='git-svn basic tests'
6
+test_description='git svn basic tests'
7
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
8
9
case "$GIT_SVN_LC_ALL" in
@@ -17,7 +17,7 @@ esac
17
18
. ./lib-git-svn.sh
19
20
-say 'define NO_SVN_TESTS to skip git-svn tests'
20
+say 'define NO_SVN_TESTS to skip git svn tests'
21
22
test_expect_success \
23
'initialize git-svn' '
@@ -34,11 +34,11 @@ test_expect_success \
34
svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
35
cd .. &&
36
rm -rf import &&
37
- git-svn init "$svnrepo"'
37
+ git svn init "$svnrepo"'
38
39
test_expect_success \
40
'import an SVN revision into git' \
41
- 'git-svn fetch'
41
+ 'git svn fetch'
42
43
test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
44
@@ -49,7 +49,7 @@ test_expect_success "$name" '
49
cp dir/file file &&
50
git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
51
git commit -m "$name" &&
52
- git-svn set-tree --find-copies-harder --rmdir \
52
+ git svn set-tree --find-copies-harder --rmdir \
53
${remotes_git_svn}..mybranch &&
54
svn up "$SVN_TREE" &&
55
test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
@@ -63,7 +63,7 @@ test_expect_success "$name" "
63
git update-index --remove dir/file &&
64
git update-index --add dir/file/file &&
65
git commit -m '$name' &&
66
- test_must_fail git-svn set-tree --find-copies-harder --rmdir \
66
+ test_must_fail git svn set-tree --find-copies-harder --rmdir \
67
${remotes_git_svn}..mybranch" || true
68
69
@@ -77,7 +77,7 @@ test_expect_success "$name" '
77
git update-index --remove -- bar/zzz &&
78
git update-index --add -- bar &&
79
git commit -m "$name" &&
80
- test_must_fail git-svn set-tree --find-copies-harder --rmdir \
80
+ test_must_fail git svn set-tree --find-copies-harder --rmdir \
81
${remotes_git_svn}..mybranch2' || true
82
83
@@ -91,7 +91,7 @@ test_expect_success "$name" '
91
echo yyy > bar/zzz/yyy &&
92
git update-index --add bar/zzz/yyy &&
93
git commit -m "$name" &&
94
- test_must_fail git-svn set-tree --find-copies-harder --rmdir \
94
+ test_must_fail git svn set-tree --find-copies-harder --rmdir \
95
${remotes_git_svn}..mybranch3' || true
96
97
@@ -105,7 +105,7 @@ test_expect_success "$name" '
105
echo asdf > dir &&
106
git update-index --add -- dir &&
107
git commit -m "$name" &&
108
- test_must_fail git-svn set-tree --find-copies-harder --rmdir \
108
+ test_must_fail git svn set-tree --find-copies-harder --rmdir \
109
${remotes_git_svn}..mybranch4' || true
110
111
@@ -116,7 +116,7 @@ test_expect_success "$name" '
116
chmod -x exec.sh &&
117
git update-index exec.sh &&
118
git commit -m "$name" &&
119
- git-svn set-tree --find-copies-harder --rmdir \
119
+ git svn set-tree --find-copies-harder --rmdir \
120
${remotes_git_svn}..mybranch5 &&
121
svn up "$SVN_TREE" &&
122
test ! -x "$SVN_TREE"/exec.sh'
@@ -127,7 +127,7 @@ test_expect_success "$name" '
127
chmod +x exec.sh &&
128
git update-index exec.sh &&
129
git commit -m "$name" &&
130
- git-svn set-tree --find-copies-harder --rmdir \
130
+ git svn set-tree --find-copies-harder --rmdir \
131
${remotes_git_svn}..mybranch5 &&
132
svn up "$SVN_TREE" &&
133
test -x "$SVN_TREE"/exec.sh'
@@ -139,7 +139,7 @@ test_expect_success "$name" '
139
ln -s bar/zzz exec.sh &&
140
git update-index exec.sh &&
141
git commit -m "$name" &&
142
- git-svn set-tree --find-copies-harder --rmdir \
142
+ git svn set-tree --find-copies-harder --rmdir \
143
${remotes_git_svn}..mybranch5 &&
144
svn up "$SVN_TREE" &&
145
test -L "$SVN_TREE"/exec.sh'
@@ -151,7 +151,7 @@ test_expect_success "$name" '
151
ln -s bar/zzz exec-2.sh &&
152
git update-index --add bar/zzz exec-2.sh &&
153
git commit -m "$name" &&
154
- git-svn set-tree --find-copies-harder --rmdir \
154
+ git svn set-tree --find-copies-harder --rmdir \
155
${remotes_git_svn}..mybranch5 &&
156
svn up "$SVN_TREE" &&
157
test -x "$SVN_TREE"/bar/zzz &&
@@ -164,7 +164,7 @@ test_expect_success "$name" '
164
cp help exec-2.sh &&
165
git update-index exec-2.sh &&
166
git commit -m "$name" &&
167
- git-svn set-tree --find-copies-harder --rmdir \
167
+ git svn set-tree --find-copies-harder --rmdir \
168
${remotes_git_svn}..mybranch5 &&
169
svn up "$SVN_TREE" &&
170
test -f "$SVN_TREE"/exec-2.sh &&
@@ -180,7 +180,7 @@ then
180
echo '# hello' >> exec-2.sh &&
181
git update-index exec-2.sh &&
182
git commit -m 'éï∏' &&
183
- git-svn set-tree HEAD"
183
+ git svn set-tree HEAD"
184
unset LC_ALL
185
else
186
say "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
@@ -190,7 +190,7 @@ name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
190
GIT_SVN_ID=alt
191
export GIT_SVN_ID
192
test_expect_success "$name" \
193
- 'git-svn init "$svnrepo" && git-svn fetch &&
193
+ 'git svn init "$svnrepo" && git svn fetch &&
194
git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
195
git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
196
test_cmp a b'
@@ -216,7 +216,7 @@ test_expect_success "$name" "test_cmp a expected"
216
test_expect_success 'exit if remote refs are ambigious' "
217
git config --add svn-remote.svn.fetch \
218
bar:refs/${remotes_git_svn} &&
219
- test_must_fail git-svn migrate
219
+ test_must_fail git svn migrate
220
"
221
222
test_expect_success 'exit if init-ing a would clobber a URL' '
@@ -224,12 +224,12 @@ test_expect_success 'exit if init-ing a would clobber a URL' '
224
svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
225
git config --unset svn-remote.svn.fetch \
226
"^bar:refs/${remotes_git_svn}$" &&
227
- test_must_fail git-svn init "${svnrepo}2/bar"
227
+ test_must_fail git svn init "${svnrepo}2/bar"
228
'
229
230
test_expect_success \
231
'init allows us to connect to another directory in the same repo' '
232
- git-svn init --minimize-url -i bar "$svnrepo/bar" &&
232
+ git svn init --minimize-url -i bar "$svnrepo/bar" &&
233
git config --get svn-remote.svn.fetch \
234
"^bar:refs/remotes/bar$" &&
235
git config --get svn-remote.svn.fetch \
@@ -237,23 +237,23 @@ test_expect_success \
237
'
238
239
test_expect_success 'able to dcommit to a subdirectory' "
240
- git-svn fetch -i bar &&
240
+ git svn fetch -i bar &&
241
git checkout -b my-bar refs/remotes/bar &&
242
echo abc > d &&
243
git update-index --add d &&
244
git commit -m '/bar/d should be in the log' &&
245
- git-svn dcommit -i bar &&
245
+ git svn dcommit -i bar &&
246
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
247
mkdir newdir &&
248
echo new > newdir/dir &&
249
git update-index --add newdir/dir &&
250
git commit -m 'add a new directory' &&
251
- git-svn dcommit -i bar &&
251
+ git svn dcommit -i bar &&
252
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
253
echo foo >> newdir/dir &&
254
git update-index newdir/dir &&
255
git commit -m 'modify a file in new directory' &&
256
- git-svn dcommit -i bar &&
256
+ git svn dcommit -i bar &&
257
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
258
"
259
@@ -261,7 +261,7 @@ test_expect_success 'able to set-tree to a subdirectory' "
261
echo cba > d &&
262
git update-index d &&
263
git commit -m 'update /bar/d' &&
264
- git-svn set-tree -i bar HEAD &&
264
+ git svn set-tree -i bar HEAD &&
265
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
266
"
267
t/t9101-git-svn-props.sh
+18
-18
@@ -3,7 +3,7 @@
3
# Copyright (c) 2006 Eric Wong
4
#
5
6
-test_description='git-svn property tests'
6
+test_description='git svn property tests'
7
. ./lib-git-svn.sh
8
9
mkdir import
@@ -66,15 +66,15 @@ test_expect_success 'setup some commits to svn' \
66
svn commit -m "Propset Id" &&
67
cd ..'
68
69
-test_expect_success 'initialize git-svn' 'git-svn init "$svnrepo"'
70
-test_expect_success 'fetch revisions from svn' 'git-svn fetch'
69
+test_expect_success 'initialize git-svn' 'git svn init "$svnrepo"'
70
+test_expect_success 'fetch revisions from svn' 'git svn fetch'
71
72
name='test svn:keywords ignoring'
73
test_expect_success "$name" \
74
'git checkout -b mybranch ${remotes_git_svn} &&
75
echo Hi again >> kw.c &&
76
git commit -a -m "test keywords ignoring" &&
77
- git-svn set-tree ${remotes_git_svn}..mybranch &&
77
+ git svn set-tree ${remotes_git_svn}..mybranch &&
78
git pull . ${remotes_git_svn}'
79
80
expect='/* $Id$ */'
@@ -90,7 +90,7 @@ test_expect_success "propset CR on crlf files" \
90
cd ..'
91
92
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
93
- 'git-svn fetch &&
93
+ 'git svn fetch &&
94
git pull . ${remotes_git_svn} &&
95
svn co "$svnrepo" new_wc'
96
@@ -113,7 +113,7 @@ cd test_wc
113
svn commit -m "propset CRLF on cr files"'
114
cd ..
115
test_expect_success 'fetch and pull latest from svn' \
116
- 'git-svn fetch && git pull . ${remotes_git_svn}'
116
+ 'git svn fetch && git pull . ${remotes_git_svn}'
117
118
b_cr="`git-hash-object cr`"
119
b_ne_cr="`git-hash-object ne_cr`"
@@ -145,7 +145,7 @@ test_expect_success 'test show-ignore' "
145
svn propset -R svn:ignore 'no-such-file*' .
146
svn commit -m 'propset svn:ignore'
147
cd .. &&
148
- git-svn show-ignore > show-ignore.got &&
148
+ git svn show-ignore > show-ignore.got &&
149
cmp show-ignore.expect show-ignore.got
150
"
151
@@ -161,8 +161,8 @@ cat >create-ignore-index.expect <<\EOF
161
EOF
162
163
test_expect_success 'test create-ignore' "
164
- git-svn fetch && git pull . ${remotes_git_svn} &&
165
- git-svn create-ignore &&
164
+ git svn fetch && git pull . ${remotes_git_svn} &&
165
+ git svn create-ignore &&
166
cmp ./.gitignore create-ignore.expect &&
167
cmp ./deeply/.gitignore create-ignore.expect &&
168
cmp ./deeply/nested/.gitignore create-ignore.expect &&
@@ -182,15 +182,15 @@ EOF
182
# pattern, it can pass even though the propget did not execute on the
183
# right directory.
184
test_expect_success 'test propget' "
185
- git-svn propget svn:ignore . | cmp - prop.expect &&
185
+ git svn propget svn:ignore . | cmp - prop.expect &&
186
cd deeply &&
187
- git-svn propget svn:ignore . | cmp - ../prop.expect &&
188
- git-svn propget svn:entry:committed-rev nested/directory/.keep \
187
+ git svn propget svn:ignore . | cmp - ../prop.expect &&
188
+ git svn propget svn:entry:committed-rev nested/directory/.keep \
189
| cmp - ../prop2.expect &&
190
- git-svn propget svn:ignore .. | cmp - ../prop.expect &&
191
- git-svn propget svn:ignore nested/ | cmp - ../prop.expect &&
192
- git-svn propget svn:ignore ./nested | cmp - ../prop.expect &&
193
- git-svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
190
+ git svn propget svn:ignore .. | cmp - ../prop.expect &&
191
+ git svn propget svn:ignore nested/ | cmp - ../prop.expect &&
192
+ git svn propget svn:ignore ./nested | cmp - ../prop.expect &&
193
+ git svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
194
"
195
196
cat >prop.expect <<\EOF
@@ -210,8 +210,8 @@ Properties on 'nested/directory/.keep':
210
EOF
211
212
test_expect_success 'test proplist' "
213
- git-svn proplist . | cmp - prop.expect &&
214
- git-svn proplist nested/directory/.keep | cmp - prop2.expect
213
+ git svn proplist . | cmp - prop.expect &&
214
+ git svn proplist nested/directory/.keep | cmp - prop2.expect
215
"
216
217
test_done
t/t9102-git-svn-deep-rmdir.sh
+4
-4
@@ -1,5 +1,5 @@
1
#!/bin/sh
2
-test_description='git-svn rmdir'
2
+test_description='git svn rmdir'
3
. ./lib-git-svn.sh
4
5
test_expect_success 'initialize repo' '
@@ -14,15 +14,15 @@ test_expect_success 'initialize repo' '
14
'
15
16
test_expect_success 'mirror via git-svn' '
17
- git-svn init "$svnrepo" &&
18
- git-svn fetch &&
17
+ git svn init "$svnrepo" &&
18
+ git svn fetch &&
19
git checkout -f -b test-rmdir ${remotes_git_svn}
20
'
21
22
test_expect_success 'Try a commit on rmdir' '
23
git rm -f deeply/nested/directory/number/2/another &&
24
git commit -a -m "remove another" &&
25
- git-svn set-tree --rmdir HEAD &&
25
+ git svn set-tree --rmdir HEAD &&
26
svn ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
27
'
28
t/t9103-git-svn-tracked-directory-removed.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Eric Wong
4
#
5
6
-test_description='git-svn tracking removed top-level path'
6
+test_description='git svn tracking removed top-level path'
7
. ./lib-git-svn.sh
8
9
test_expect_success 'make history for tracking' '
t/t9104-git-svn-follow-parent.sh
+19
-19
@@ -3,7 +3,7 @@
3
# Copyright (c) 2006 Eric Wong
4
#
5
6
-test_description='git-svn fetching'
6
+test_description='git svn fetching'
7
. ./lib-git-svn.sh
8
9
test_expect_success 'initialize repo' '
@@ -27,8 +27,8 @@ test_expect_success 'initialize repo' '
27
'
28
29
test_expect_success 'init and fetch a moved directory' '
30
- git-svn init --minimize-url -i thunk "$svnrepo"/thunk &&
31
- git-svn fetch -i thunk &&
30
+ git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
31
+ git svn fetch -i thunk &&
32
test "`git rev-parse --verify refs/remotes/thunk@2`" \
33
= "`git rev-parse --verify refs/remotes/thunk~1`" &&
34
test "`git cat-file blob refs/remotes/thunk:readme |\
@@ -43,7 +43,7 @@ test_expect_success 'init and fetch from one svn-remote' '
43
trunk:refs/remotes/svn/trunk &&
44
git config --add svn-remote.svn.fetch \
45
thunk:refs/remotes/svn/thunk &&
46
- git-svn fetch -i svn/thunk &&
46
+ git svn fetch -i svn/thunk &&
47
test "`git rev-parse --verify refs/remotes/svn/trunk`" \
48
= "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
49
test "`git cat-file blob refs/remotes/svn/thunk:readme |\
@@ -57,8 +57,8 @@ test_expect_success 'follow deleted parent' '
57
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
58
git config --add svn-remote.svn.fetch \
59
junk:refs/remotes/svn/junk &&
60
- git-svn fetch -i svn/thunk &&
61
- git-svn fetch -i svn/junk &&
60
+ git svn fetch -i svn/thunk &&
61
+ git svn fetch -i svn/junk &&
62
test -z "`git diff svn/junk svn/trunk`" &&
63
test "`git merge-base svn/junk svn/trunk`" \
64
= "`git rev-parse svn/trunk`"
@@ -69,9 +69,9 @@ test_expect_success 'follow larger parent' '
69
echo hi > import/trunk/thunk/bump/thud/file &&
70
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
71
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
72
- git-svn init --minimize-url -i larger \
72
+ git svn init --minimize-url -i larger \
73
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
74
- git-svn fetch -i larger &&
74
+ git svn fetch -i larger &&
75
git rev-parse --verify refs/remotes/larger &&
76
git rev-parse --verify \
77
refs/remotes/larger-parent/trunk/thunk/bump/thud &&
@@ -92,15 +92,15 @@ test_expect_success 'follow higher-level parent' '
92
cd ..
93
svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
94
svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
95
- git-svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
96
- git-svn fetch -i blob
95
+ git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
96
+ git svn fetch -i blob
97
'
98
99
test_expect_success 'follow deleted directory' '
100
svn mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
101
svn rm -m "remove glob" "$svnrepo"/glob &&
102
- git-svn init --minimize-url -i glob "$svnrepo"/glob &&
103
- git-svn fetch -i glob &&
102
+ git svn init --minimize-url -i glob "$svnrepo"/glob &&
103
+ git svn fetch -i glob &&
104
test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
105
test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
106
'
@@ -129,9 +129,9 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
129
poke native/t/c.t &&
130
svn commit -m "reorg test" &&
131
cd .. &&
132
- git-svn init --minimize-url -i r9270-t \
132
+ git svn init --minimize-url -i r9270-t \
133
"$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
134
- git-svn fetch -i r9270-t &&
134
+ git svn fetch -i r9270-t &&
135
test `git rev-list r9270-t | wc -l` -eq 2 &&
136
test "`git ls-tree --name-only r9270-t~1`" = \
137
"`git ls-tree --name-only r9270-t`"
@@ -139,9 +139,9 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
139
140
test_expect_success "track initial change if it was only made to parent" '
141
svn cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
142
- git-svn init --minimize-url -i r9270-d \
142
+ git svn init --minimize-url -i r9270-d \
143
"$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
144
- git-svn fetch -i r9270-d &&
144
+ git svn fetch -i r9270-d &&
145
test `git rev-list r9270-d | wc -l` -eq 3 &&
146
test "`git ls-tree --name-only r9270-t`" = \
147
"`git ls-tree --name-only r9270-d`" &&
@@ -151,19 +151,19 @@ test_expect_success "track initial change if it was only made to parent" '
151
152
test_expect_success "track multi-parent paths" '
153
svn cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
154
- git-svn multi-fetch &&
154
+ git svn multi-fetch &&
155
test `git cat-file commit refs/remotes/glob | \
156
grep "^parent " | wc -l` -eq 2
157
'
158
159
test_expect_success "multi-fetch continues to work" "
160
- git-svn multi-fetch
160
+ git svn multi-fetch
161
"
162
163
test_expect_success "multi-fetch works off a 'clean' repository" '
164
rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" &&
165
mkdir "$GIT_DIR/svn" &&
166
- git-svn multi-fetch
166
+ git svn multi-fetch
167
'
168
169
test_debug 'gitk --all &'
t/t9105-git-svn-commit-diff.sh
+6
-6
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
#
3
# Copyright (c) 2006 Eric Wong
4
-test_description='git-svn commit-diff'
4
+test_description='git svn commit-diff'
5
. ./lib-git-svn.sh
6
7
test_expect_success 'initialize repo' '
@@ -26,16 +26,16 @@ prev=`git rev-parse --verify HEAD^1`
26
27
test_expect_success 'test the commit-diff command' '
28
test -n "$prev" && test -n "$head" &&
29
- git-svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
29
+ git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
30
svn co "$svnrepo" wc &&
31
cmp readme wc/readme
32
'
33
34
-test_expect_success 'commit-diff to a sub-directory (with git-svn config)' '
34
+test_expect_success 'commit-diff to a sub-directory (with git svn config)' '
35
svn import -m "sub-directory" import "$svnrepo"/subdir &&
36
- git-svn init --minimize-url "$svnrepo"/subdir &&
37
- git-svn fetch &&
38
- git-svn commit-diff -r3 "$prev" "$head" &&
36
+ git svn init --minimize-url "$svnrepo"/subdir &&
37
+ git svn fetch &&
38
+ git svn commit-diff -r3 "$prev" "$head" &&
39
svn cat "$svnrepo"/subdir/readme > readme.2 &&
40
cmp readme readme.2
41
'
t/t9106-git-svn-commit-diff-clobber.sh
+8
-8
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
#
3
# Copyright (c) 2006 Eric Wong
4
-test_description='git-svn commit-diff clobber'
4
+test_description='git svn commit-diff clobber'
5
. ./lib-git-svn.sh
6
7
test_expect_success 'initialize repo' '
@@ -27,7 +27,7 @@ test_expect_success 'commit change from svn side' '
27
test_expect_success 'commit conflicting change from git' '
28
echo second line from git >> file &&
29
git commit -a -m "second line from git" &&
30
- test_must_fail git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
30
+ test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
31
'
32
33
test_expect_success 'commit complementing change from git' '
@@ -36,12 +36,12 @@ test_expect_success 'commit complementing change from git' '
36
git commit -a -m "second line from svn" &&
37
echo third line from git >> file &&
38
git commit -a -m "third line from git" &&
39
- git-svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
39
+ git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
40
'
41
42
test_expect_success 'dcommit fails to commit because of conflict' '
43
- git-svn init "$svnrepo" &&
44
- git-svn fetch &&
43
+ git svn init "$svnrepo" &&
44
+ git svn fetch &&
45
git reset --hard refs/${remotes_git_svn} &&
46
svn co "$svnrepo" t.svn &&
47
cd t.svn &&
@@ -52,7 +52,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
52
rm -rf t.svn &&
53
echo "fourth line from git" >> file &&
54
git commit -a -m "fourth line from git" &&
55
- test_must_fail git-svn dcommit
55
+ test_must_fail git svn dcommit
56
'
57
58
test_expect_success 'dcommit does the svn equivalent of an index merge' "
@@ -63,7 +63,7 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' "
63
echo 'more changes' >> file2 &&
64
git update-index file2 &&
65
git commit -a -m 'more changes' &&
66
- git-svn dcommit
66
+ git svn dcommit
67
"
68
69
test_expect_success 'commit another change from svn side' '
@@ -76,7 +76,7 @@ test_expect_success 'commit another change from svn side' '
76
rm -rf t.svn
77
'
78
79
-test_expect_success 'multiple dcommit from git-svn will not clobber svn' "
79
+test_expect_success 'multiple dcommit from git svn will not clobber svn' "
80
git reset --hard refs/${remotes_git_svn} &&
81
echo new file >> new-file &&
82
git update-index --add new-file &&
t/t9106-git-svn-dcommit-clobber-series.sh
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
#
3
# Copyright (c) 2007 Eric Wong
4
-test_description='git-svn dcommit clobber series'
4
+test_description='git svn dcommit clobber series'
5
. ./lib-git-svn.sh
6
7
test_expect_success 'initialize repo' '
t/t9107-git-svn-migrate.sh
+11
-11
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
# Copyright (c) 2006 Eric Wong
3
-test_description='git-svn metadata migrations from previous versions'
3
+test_description='git svn metadata migrations from previous versions'
4
. ./lib-git-svn.sh
5
6
test_expect_success 'setup old-looking metadata' '
@@ -14,8 +14,8 @@ test_expect_success 'setup old-looking metadata' '
14
done && \
15
svn import -m test . "$svnrepo"
16
cd .. &&
17
- git-svn init "$svnrepo" &&
18
- git-svn fetch &&
17
+ git svn init "$svnrepo" &&
18
+ git svn fetch &&
19
mv "$GIT_DIR"/svn/* "$GIT_DIR"/ &&
20
mv "$GIT_DIR"/svn/.metadata "$GIT_DIR"/ &&
21
rmdir "$GIT_DIR"/svn &&
@@ -27,12 +27,12 @@ test_expect_success 'setup old-looking metadata' '
27
head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
28
test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
29
30
-test_expect_success 'initialize old-style (v0) git-svn layout' '
30
+test_expect_success 'initialize old-style (v0) git svn layout' '
31
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
32
echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
33
echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
34
- git-svn migrate &&
35
- ! test -d "$GIT_DIR"/git-svn &&
34
+ git svn migrate &&
35
+ ! test -d "$GIT_DIR"/git svn &&
36
git rev-parse --verify refs/${remotes_git_svn}^0 &&
37
git rev-parse --verify refs/remotes/svn^0 &&
38
test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
@@ -41,7 +41,7 @@ test_expect_success 'initialize old-style (v0) git-svn layout' '
41
'
42
43
test_expect_success 'initialize a multi-repository repo' '
44
- git-svn init "$svnrepo" -T trunk -t tags -b branches &&
44
+ git svn init "$svnrepo" -T trunk -t tags -b branches &&
45
git config --get-all svn-remote.svn.fetch > fetch.out &&
46
grep "^trunk:refs/remotes/trunk$" fetch.out &&
47
test -n "`git config --get svn-remote.svn.branches \
@@ -61,7 +61,7 @@ test_expect_success 'initialize a multi-repository repo' '
61
62
# refs should all be different, but the trees should all be the same:
63
test_expect_success 'multi-fetch works on partial urls + paths' "
64
- git-svn multi-fetch &&
64
+ git svn multi-fetch &&
65
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
66
git rev-parse --verify refs/remotes/\$i^0 >> refs.out || exit 1;
67
done &&
@@ -85,7 +85,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
85
( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
86
echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
87
done &&
88
- git-svn migrate --minimize &&
88
+ git svn migrate --minimize &&
89
test -z "`git config -l |grep -v "^svn-remote\.git-svn\."`" &&
90
git config --get-all svn-remote.svn.fetch > fetch.out &&
91
grep "^trunk:refs/remotes/trunk$" fetch.out &&
@@ -98,7 +98,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
98
'
99
100
test_expect_success ".rev_db auto-converted to .rev_map.UUID" '
101
- git-svn fetch -i trunk &&
101
+ git svn fetch -i trunk &&
102
test -z "$(ls "$GIT_DIR"/svn/trunk/.rev_db.* 2>/dev/null)" &&
103
expect="$(ls "$GIT_DIR"/svn/trunk/.rev_map.*)" &&
104
test -n "$expect" &&
@@ -106,7 +106,7 @@ test_expect_success ".rev_db auto-converted to .rev_map.UUID" '
106
convert_to_rev_db "$expect" "$rev_db" &&
107
rm -f "$expect" &&
108
test -f "$rev_db" &&
109
- git-svn fetch -i trunk &&
109
+ git svn fetch -i trunk &&
110
test -z "$(ls "$GIT_DIR"/svn/trunk/.rev_db.* 2>/dev/null)" &&
111
test ! -e "$GIT_DIR"/svn/trunk/.rev_db &&
112
test -f "$expect"
t/t9108-git-svn-glob.sh
+4
-4
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
# Copyright (c) 2007 Eric Wong
3
-test_description='git-svn globbing refspecs'
3
+test_description='git svn globbing refspecs'
4
. ./lib-git-svn.sh
5
6
cat > expect.end <<EOF
@@ -46,7 +46,7 @@ test_expect_success 'test refspec globbing' '
46
"branches/*/src/a:refs/remotes/branches/*" &&
47
git config --add svn-remote.svn.tags\
48
"tags/*/src/a:refs/remotes/tags/*" &&
49
- git-svn multi-fetch &&
49
+ git svn multi-fetch &&
50
git log --pretty=oneline refs/remotes/tags/end | \
51
sed -e "s/^.\{41\}//" > output.end &&
52
test_cmp expect.end output.end &&
@@ -74,7 +74,7 @@ test_expect_success 'test left-hand-side only globbing' '
74
poke tags/end/src/b/readme &&
75
svn commit -m "try to try"
76
) &&
77
- git-svn fetch two &&
77
+ git svn fetch two &&
78
test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
79
test `git rev-list refs/remotes/two/branches/start | wc -l` -eq 3 &&
80
test `git rev-parse refs/remotes/two/branches/start~2` = \
@@ -104,7 +104,7 @@ test_expect_success 'test disallow multi-globs' '
104
poke tags/end/src/b/readme &&
105
svn commit -m "try to try"
106
) &&
107
- test_must_fail git-svn fetch three 2> stderr.three &&
107
+ test_must_fail git svn fetch three 2> stderr.three &&
108
test_cmp expect.three stderr.three
109
'
110
t/t9108-git-svn-multi-glob.sh
+5
-5
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
# Copyright (c) 2007 Eric Wong
3
-test_description='git-svn globbing refspecs'
3
+test_description='git svn globbing refspecs'
4
. ./lib-git-svn.sh
5
6
cat > expect.end <<EOF
@@ -46,7 +46,7 @@ test_expect_success 'test refspec globbing' '
46
"branches/*/*/src/a:refs/remotes/branches/*/*" &&
47
git config --add svn-remote.svn.tags\
48
"tags/*/src/a:refs/remotes/tags/*" &&
49
- git-svn multi-fetch &&
49
+ git svn multi-fetch &&
50
git log --pretty=oneline refs/remotes/tags/end | \
51
sed -e "s/^.\{41\}//" > output.end &&
52
test_cmp expect.end output.end &&
@@ -74,7 +74,7 @@ test_expect_success 'test left-hand-side only globbing' '
74
poke tags/end/src/b/readme &&
75
svn commit -m "try to try"
76
) &&
77
- git-svn fetch two &&
77
+ git svn fetch two &&
78
test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
79
test `git rev-list refs/remotes/two/branches/v1/start | wc -l` -eq 3 &&
80
test `git rev-parse refs/remotes/two/branches/v1/start~2` = \
@@ -123,7 +123,7 @@ test_expect_success 'test another branch' '
123
"branches/*/*:refs/remotes/four/branches/*/*" &&
124
git config --add svn-remote.four.tags \
125
"tags/*:refs/remotes/four/tags/*" &&
126
- git-svn fetch four &&
126
+ git svn fetch four &&
127
test `git rev-list refs/remotes/four/tags/next | wc -l` -eq 5 &&
128
test `git rev-list refs/remotes/four/branches/v2/start | wc -l` -eq 3 &&
129
test `git rev-parse refs/remotes/four/branches/v2/start~2` = \
@@ -153,7 +153,7 @@ test_expect_success 'test disallow multiple globs' '
153
poke tags/end/src/b/readme &&
154
svn commit -m "try to try"
155
) &&
156
- test_must_fail git-svn fetch three 2> stderr.three &&
156
+ test_must_fail git svn fetch three 2> stderr.three &&
157
test_cmp expect.three stderr.three
158
'
159
t/t9110-git-svn-use-svm-props.sh
+7
-7
@@ -3,18 +3,18 @@
3
# Copyright (c) 2007 Eric Wong
4
#
5
6
-test_description='git-svn useSvmProps test'
6
+test_description='git svn useSvmProps test'
7
8
. ./lib-git-svn.sh
9
10
test_expect_success 'load svm repo' '
11
svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
12
- git-svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
13
- git-svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
14
- git-svn init --minimize-url -R argh -i e \
12
+ git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
13
+ git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
14
+ git svn init --minimize-url -R argh -i e \
15
"$svnrepo"/mirror/argh/a/b/c/d/e &&
16
git config svn.useSvmProps true &&
17
- git-svn fetch --all
17
+ git svn fetch --all
18
'
19
20
uuid=161ce429-a9dd-4828-af4a-52023f968c89
@@ -50,12 +50,12 @@ test_expect_success 'verify metadata for /dir' "
50
"
51
52
test_expect_success 'find commit based on SVN revision number' "
53
- git-svn find-rev r12 |
53
+ git svn find-rev r12 |
54
grep `git rev-parse HEAD`
55
"
56
57
test_expect_success 'empty rebase' "
58
- git-svn rebase
58
+ git svn rebase
59
"
60
61
test_done
t/t9111-git-svn-use-svnsync-props.sh
+5
-5
@@ -3,17 +3,17 @@
3
# Copyright (c) 2007 Eric Wong
4
#
5
6
-test_description='git-svn useSvnsyncProps test'
6
+test_description='git svn useSvnsyncProps test'
7
8
. ./lib-git-svn.sh
9
10
test_expect_success 'load svnsync repo' '
11
svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
12
- git-svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
13
- git-svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
14
- git-svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
12
+ git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
13
+ git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
14
+ git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
15
git config svn.useSvnsyncProps true &&
16
- git-svn fetch --all
16
+ git svn fetch --all
17
'
18
19
uuid=161ce429-a9dd-4828-af4a-52023f968c89
t/t9112-git-svn-md5less-file.sh
+2
-2
@@ -42,6 +42,6 @@ EOF
42
43
test_expect_success 'load svn dumpfile' 'svnadmin load "$rawsvnrepo" < dumpfile.svn'
44
45
-test_expect_success 'initialize git-svn' 'git-svn init "$svnrepo"'
46
-test_expect_success 'fetch revisions from svn' 'git-svn fetch'
45
+test_expect_success 'initialize git-svn' 'git svn init "$svnrepo"'
46
+test_expect_success 'fetch revisions from svn' 'git svn fetch'
47
test_done
t/t9113-git-svn-dcommit-new-file.sh
+1
-1
@@ -8,7 +8,7 @@
8
# daemon running on a users system if the test fails.
9
# Not all git users will need to interact with SVN.
10
11
-test_description='git-svn dcommit new files over svn:// test'
11
+test_description='git svn dcommit new files over svn:// test'
12
13
. ./lib-git-svn.sh
14
t/t9114-git-svn-dcommit-merge.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Eric Wong
4
# Based on a script by Joakim Tjernlund <joakim.tjernlund@transmode.se>
5
6
-test_description='git-svn dcommit handles merges'
6
+test_description='git svn dcommit handles merges'
7
8
. ./lib-git-svn.sh
9
t/t9115-git-svn-dcommit-funky-renames.sh
+2
-2
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Eric Wong
4
5
6
-test_description='git-svn dcommit can commit renames of files with ugly names'
6
+test_description='git svn dcommit can commit renames of files with ugly names'
7
8
. ./lib-git-svn.sh
9
@@ -75,7 +75,7 @@ test_expect_success 'make a commit to test rebase' '
75
git svn dcommit
76
'
77
78
-test_expect_success 'git-svn rebase works inside a fresh-cloned repository' '
78
+test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
79
cd test-rebase &&
80
git svn rebase &&
81
test -e test-rebase-main &&
t/t9116-git-svn-log.sh
+3
-3
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Eric Wong
4
#
5
6
-test_description='git-svn log tests'
6
+test_description='git svn log tests'
7
. ./lib-git-svn.sh
8
9
test_expect_success 'setup repository and import' '
@@ -16,8 +16,8 @@ test_expect_success 'setup repository and import' '
16
done && \
17
svn import -m test . "$svnrepo"
18
cd .. &&
19
- git-svn init "$svnrepo" -T trunk -b branches -t tags &&
20
- git-svn fetch &&
19
+ git svn init "$svnrepo" -T trunk -b branches -t tags &&
20
+ git svn fetch &&
21
git reset --hard trunk &&
22
echo bye >> README &&
23
git commit -a -m bye &&
t/t9117-git-svn-init-clone.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Eric Wong
4
#
5
6
-test_description='git-svn init/clone tests'
6
+test_description='git svn init/clone tests'
7
8
. ./lib-git-svn.sh
9
t/t9118-git-svn-funky-branch-names.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Eric Wong
4
#
5
6
-test_description='git-svn funky branch names'
6
+test_description='git svn funky branch names'
7
. ./lib-git-svn.sh
8
9
# Abo-Uebernahme (Bug #994)
t/t9119-git-svn-info.sh
+40
-40
@@ -2,7 +2,7 @@
2
#
3
# Copyright (c) 2007 David D. Kilzer
4
5
-test_description='git-svn info'
5
+test_description='git svn info'
6
7
. ./lib-git-svn.sh
8
@@ -56,8 +56,8 @@ test_expect_success 'setup repository and import' '
56
cd .. &&
57
mkdir gitwc &&
58
cd gitwc &&
59
- git-svn init "$svnrepo" &&
60
- git-svn fetch &&
59
+ git svn init "$svnrepo" &&
60
+ git svn fetch &&
61
cd .. &&
62
ptouch gitwc/file svnwc/file &&
63
ptouch gitwc/directory svnwc/directory &&
@@ -67,71 +67,71 @@ test_expect_success 'setup repository and import' '
67
68
test_expect_success 'info' "
69
(cd svnwc; svn info) > expected.info &&
70
- (cd gitwc; git-svn info) > actual.info &&
70
+ (cd gitwc; git svn info) > actual.info &&
71
test_cmp expected.info actual.info
72
"
73
74
test_expect_success 'info --url' '
75
- test "$(cd gitwc; git-svn info --url)" = "$quoted_svnrepo"
75
+ test "$(cd gitwc; git svn info --url)" = "$quoted_svnrepo"
76
'
77
78
test_expect_success 'info .' "
79
(cd svnwc; svn info .) > expected.info-dot &&
80
- (cd gitwc; git-svn info .) > actual.info-dot &&
80
+ (cd gitwc; git svn info .) > actual.info-dot &&
81
test_cmp expected.info-dot actual.info-dot
82
"
83
84
test_expect_success 'info --url .' '
85
- test "$(cd gitwc; git-svn info --url .)" = "$quoted_svnrepo"
85
+ test "$(cd gitwc; git svn info --url .)" = "$quoted_svnrepo"
86
'
87
88
test_expect_success 'info file' "
89
(cd svnwc; svn info file) > expected.info-file &&
90
- (cd gitwc; git-svn info file) > actual.info-file &&
90
+ (cd gitwc; git svn info file) > actual.info-file &&
91
test_cmp expected.info-file actual.info-file
92
"
93
94
test_expect_success 'info --url file' '
95
- test "$(cd gitwc; git-svn info --url file)" = "$quoted_svnrepo/file"
95
+ test "$(cd gitwc; git svn info --url file)" = "$quoted_svnrepo/file"
96
'
97
98
test_expect_success 'info directory' "
99
(cd svnwc; svn info directory) > expected.info-directory &&
100
- (cd gitwc; git-svn info directory) > actual.info-directory &&
100
+ (cd gitwc; git svn info directory) > actual.info-directory &&
101
test_cmp expected.info-directory actual.info-directory
102
"
103
104
test_expect_success 'info inside directory' "
105
(cd svnwc/directory; svn info) > expected.info-inside-directory &&
106
- (cd gitwc/directory; git-svn info) > actual.info-inside-directory &&
106
+ (cd gitwc/directory; git svn info) > actual.info-inside-directory &&
107
test_cmp expected.info-inside-directory actual.info-inside-directory
108
"
109
110
test_expect_success 'info --url directory' '
111
- test "$(cd gitwc; git-svn info --url directory)" = "$quoted_svnrepo/directory"
111
+ test "$(cd gitwc; git svn info --url directory)" = "$quoted_svnrepo/directory"
112
'
113
114
test_expect_success 'info symlink-file' "
115
(cd svnwc; svn info symlink-file) > expected.info-symlink-file &&
116
- (cd gitwc; git-svn info symlink-file) > actual.info-symlink-file &&
116
+ (cd gitwc; git svn info symlink-file) > actual.info-symlink-file &&
117
test_cmp expected.info-symlink-file actual.info-symlink-file
118
"
119
120
test_expect_success 'info --url symlink-file' '
121
- test "$(cd gitwc; git-svn info --url symlink-file)" \
121
+ test "$(cd gitwc; git svn info --url symlink-file)" \
122
= "$quoted_svnrepo/symlink-file"
123
'
124
125
test_expect_success 'info symlink-directory' "
126
(cd svnwc; svn info symlink-directory) \
127
> expected.info-symlink-directory &&
128
- (cd gitwc; git-svn info symlink-directory) \
128
+ (cd gitwc; git svn info symlink-directory) \
129
> actual.info-symlink-directory &&
130
test_cmp expected.info-symlink-directory actual.info-symlink-directory
131
"
132
133
test_expect_success 'info --url symlink-directory' '
134
- test "$(cd gitwc; git-svn info --url symlink-directory)" \
134
+ test "$(cd gitwc; git svn info --url symlink-directory)" \
135
= "$quoted_svnrepo/symlink-directory"
136
'
137
@@ -146,12 +146,12 @@ test_expect_success 'info added-file' "
146
svn add added-file > /dev/null &&
147
cd .. &&
148
(cd svnwc; svn info added-file) > expected.info-added-file &&
149
- (cd gitwc; git-svn info added-file) > actual.info-added-file &&
149
+ (cd gitwc; git svn info added-file) > actual.info-added-file &&
150
test_cmp expected.info-added-file actual.info-added-file
151
"
152
153
test_expect_success 'info --url added-file' '
154
- test "$(cd gitwc; git-svn info --url added-file)" \
154
+ test "$(cd gitwc; git svn info --url added-file)" \
155
= "$quoted_svnrepo/added-file"
156
'
157
@@ -167,13 +167,13 @@ test_expect_success 'info added-directory' "
167
cd .. &&
168
(cd svnwc; svn info added-directory) \
169
> expected.info-added-directory &&
170
- (cd gitwc; git-svn info added-directory) \
170
+ (cd gitwc; git svn info added-directory) \
171
> actual.info-added-directory &&
172
test_cmp expected.info-added-directory actual.info-added-directory
173
"
174
175
test_expect_success 'info --url added-directory' '
176
- test "$(cd gitwc; git-svn info --url added-directory)" \
176
+ test "$(cd gitwc; git svn info --url added-directory)" \
177
= "$quoted_svnrepo/added-directory"
178
'
179
@@ -189,14 +189,14 @@ test_expect_success 'info added-symlink-file' "
189
ptouch gitwc/added-symlink-file svnwc/added-symlink-file &&
190
(cd svnwc; svn info added-symlink-file) \
191
> expected.info-added-symlink-file &&
192
- (cd gitwc; git-svn info added-symlink-file) \
192
+ (cd gitwc; git svn info added-symlink-file) \
193
> actual.info-added-symlink-file &&
194
test_cmp expected.info-added-symlink-file \
195
actual.info-added-symlink-file
196
"
197
198
test_expect_success 'info --url added-symlink-file' '
199
- test "$(cd gitwc; git-svn info --url added-symlink-file)" \
199
+ test "$(cd gitwc; git svn info --url added-symlink-file)" \
200
= "$quoted_svnrepo/added-symlink-file"
201
'
202
@@ -212,14 +212,14 @@ test_expect_success 'info added-symlink-directory' "
212
ptouch gitwc/added-symlink-directory svnwc/added-symlink-directory &&
213
(cd svnwc; svn info added-symlink-directory) \
214
> expected.info-added-symlink-directory &&
215
- (cd gitwc; git-svn info added-symlink-directory) \
215
+ (cd gitwc; git svn info added-symlink-directory) \
216
> actual.info-added-symlink-directory &&
217
test_cmp expected.info-added-symlink-directory \
218
actual.info-added-symlink-directory
219
"
220
221
test_expect_success 'info --url added-symlink-directory' '
222
- test "$(cd gitwc; git-svn info --url added-symlink-directory)" \
222
+ test "$(cd gitwc; git svn info --url added-symlink-directory)" \
223
= "$quoted_svnrepo/added-symlink-directory"
224
'
225
@@ -238,14 +238,14 @@ test_expect_success 'info deleted-file' "
238
(cd svnwc; svn info file) |
239
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
240
> expected.info-deleted-file &&
241
- (cd gitwc; git-svn info file) |
241
+ (cd gitwc; git svn info file) |
242
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
243
> actual.info-deleted-file &&
244
test_cmp expected.info-deleted-file actual.info-deleted-file
245
"
246
247
test_expect_success 'info --url file (deleted)' '
248
- test "$(cd gitwc; git-svn info --url file)" \
248
+ test "$(cd gitwc; git svn info --url file)" \
249
= "$quoted_svnrepo/file"
250
'
251
@@ -259,14 +259,14 @@ test_expect_success 'info deleted-directory' "
259
(cd svnwc; svn info directory) |
260
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
261
> expected.info-deleted-directory &&
262
- (cd gitwc; git-svn info directory) |
262
+ (cd gitwc; git svn info directory) |
263
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
264
> actual.info-deleted-directory &&
265
test_cmp expected.info-deleted-directory actual.info-deleted-directory
266
"
267
268
test_expect_success 'info --url directory (deleted)' '
269
- test "$(cd gitwc; git-svn info --url directory)" \
269
+ test "$(cd gitwc; git svn info --url directory)" \
270
= "$quoted_svnrepo/directory"
271
'
272
@@ -280,7 +280,7 @@ test_expect_success 'info deleted-symlink-file' "
280
(cd svnwc; svn info symlink-file) |
281
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
282
> expected.info-deleted-symlink-file &&
283
- (cd gitwc; git-svn info symlink-file) |
283
+ (cd gitwc; git svn info symlink-file) |
284
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
285
> actual.info-deleted-symlink-file &&
286
test_cmp expected.info-deleted-symlink-file \
@@ -288,7 +288,7 @@ test_expect_success 'info deleted-symlink-file' "
288
"
289
290
test_expect_success 'info --url symlink-file (deleted)' '
291
- test "$(cd gitwc; git-svn info --url symlink-file)" \
291
+ test "$(cd gitwc; git svn info --url symlink-file)" \
292
= "$quoted_svnrepo/symlink-file"
293
'
294
@@ -302,7 +302,7 @@ test_expect_success 'info deleted-symlink-directory' "
302
(cd svnwc; svn info symlink-directory) |
303
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
304
> expected.info-deleted-symlink-directory &&
305
- (cd gitwc; git-svn info symlink-directory) |
305
+ (cd gitwc; git svn info symlink-directory) |
306
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
307
> actual.info-deleted-symlink-directory &&
308
test_cmp expected.info-deleted-symlink-directory \
@@ -310,7 +310,7 @@ test_expect_success 'info deleted-symlink-directory' "
310
"
311
312
test_expect_success 'info --url symlink-directory (deleted)' '
313
- test "$(cd gitwc; git-svn info --url symlink-directory)" \
313
+ test "$(cd gitwc; git svn info --url symlink-directory)" \
314
= "$quoted_svnrepo/symlink-directory"
315
'
316
@@ -319,27 +319,27 @@ test_expect_success 'info --url symlink-directory (deleted)' '
319
320
test_expect_success 'info unknown-file' "
321
echo two > gitwc/unknown-file &&
322
- (cd gitwc; test_must_fail git-svn info unknown-file) \
322
+ (cd gitwc; test_must_fail git svn info unknown-file) \
323
2> actual.info-unknown-file &&
324
grep unknown-file actual.info-unknown-file
325
"
326
327
test_expect_success 'info --url unknown-file' '
328
echo two > gitwc/unknown-file &&
329
- (cd gitwc; test_must_fail git-svn info --url unknown-file) \
329
+ (cd gitwc; test_must_fail git svn info --url unknown-file) \
330
2> actual.info-url-unknown-file &&
331
grep unknown-file actual.info-url-unknown-file
332
'
333
334
test_expect_success 'info unknown-directory' "
335
mkdir gitwc/unknown-directory svnwc/unknown-directory &&
336
- (cd gitwc; test_must_fail git-svn info unknown-directory) \
336
+ (cd gitwc; test_must_fail git svn info unknown-directory) \
337
2> actual.info-unknown-directory &&
338
grep unknown-directory actual.info-unknown-directory
339
"
340
341
test_expect_success 'info --url unknown-directory' '
342
- (cd gitwc; test_must_fail git-svn info --url unknown-directory) \
342
+ (cd gitwc; test_must_fail git svn info --url unknown-directory) \
343
2> actual.info-url-unknown-directory &&
344
grep unknown-directory actual.info-url-unknown-directory
345
'
@@ -348,13 +348,13 @@ test_expect_success 'info unknown-symlink-file' "
348
cd gitwc &&
349
ln -s unknown-file unknown-symlink-file &&
350
cd .. &&
351
- (cd gitwc; test_must_fail git-svn info unknown-symlink-file) \
351
+ (cd gitwc; test_must_fail git svn info unknown-symlink-file) \
352
2> actual.info-unknown-symlink-file &&
353
grep unknown-symlink-file actual.info-unknown-symlink-file
354
"
355
356
test_expect_success 'info --url unknown-symlink-file' '
357
- (cd gitwc; test_must_fail git-svn info --url unknown-symlink-file) \
357
+ (cd gitwc; test_must_fail git svn info --url unknown-symlink-file) \
358
2> actual.info-url-unknown-symlink-file &&
359
grep unknown-symlink-file actual.info-url-unknown-symlink-file
360
'
@@ -363,13 +363,13 @@ test_expect_success 'info unknown-symlink-directory' "
363
cd gitwc &&
364
ln -s unknown-directory unknown-symlink-directory &&
365
cd .. &&
366
- (cd gitwc; test_must_fail git-svn info unknown-symlink-directory) \
366
+ (cd gitwc; test_must_fail git svn info unknown-symlink-directory) \
367
2> actual.info-unknown-symlink-directory &&
368
grep unknown-symlink-directory actual.info-unknown-symlink-directory
369
"
370
371
test_expect_success 'info --url unknown-symlink-directory' '
372
- (cd gitwc; test_must_fail git-svn info --url unknown-symlink-directory) \
372
+ (cd gitwc; test_must_fail git svn info --url unknown-symlink-directory) \
373
2> actual.info-url-unknown-symlink-directory &&
374
grep unknown-symlink-directory actual.info-url-unknown-symlink-directory
375
'
t/t9120-git-svn-clone-with-percent-escapes.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2008 Kevin Ballard
4
#
5
6
-test_description='git-svn clone with percent escapes'
6
+test_description='git svn clone with percent escapes'
7
. ./lib-git-svn.sh
8
9
test_expect_success 'setup svnrepo' '
t/t9121-git-svn-fetch-renamed-dir.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2008 Santhosh Kumar Mani
4
5
6
-test_description='git-svn can fetch renamed directories'
6
+test_description='git svn can fetch renamed directories'
7
8
. ./lib-git-svn.sh
9
t/t9123-git-svn-rebuild-with-rewriteroot.sh
+1
-1
@@ -3,7 +3,7 @@
3
# Copyright (c) 2008 Jan Krüger
4
#
5
6
-test_description='git-svn respects rewriteRoot during rebuild'
6
+test_description='git svn respects rewriteRoot during rebuild'
7
8
. ./lib-git-svn.sh
9
t/t9124-git-svn-dcommit-auto-props.sh
+3
-3
@@ -2,7 +2,7 @@
2
#
3
# Copyright (c) 2008 Brad King
4
5
-test_description='git-svn dcommit honors auto-props'
5
+test_description='git svn dcommit honors auto-props'
6
7
. ./lib-git-svn.sh
8
@@ -24,8 +24,8 @@ test_expect_success 'initialize git-svn' '
24
svn import -m "import for git-svn" . "$svnrepo"
25
) &&
26
rm -rf import &&
27
- git-svn init "$svnrepo"
28
- git-svn fetch
27
+ git svn init "$svnrepo"
28
+ git svn fetch
29
'
30
31
test_expect_success 'enable auto-props config' '
t/t9125-git-svn-multi-glob-branch-names.sh
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
# Copyright (c) 2008 Marcus Griep
3
4
-test_description='git-svn multi-glob branch names'
4
+test_description='git svn multi-glob branch names'
5
. ./lib-git-svn.sh
6
7
test_expect_success 'setup svnrepo' '