Skip to content

Commit 1364ff2

Browse files
Nanako Shiraishigitster
Nanako Shiraishi
authored and
gitster
committed
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>
1 parent 16805d3 commit 1364ff2

27 files changed

+174
-174
lines changed

‎t/lib-git-svn.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git_svn_id=git""-svn-id
55

66
if test -n "$NO_SVN_TESTS"
77
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' :
99
test_done
1010
exit
1111
fi
@@ -17,7 +17,7 @@ SVN_TREE=$GIT_SVN_DIR/svn-tree
1717
svn >/dev/null 2>&1
1818
if test $? -ne 1
1919
then
20-
test_expect_success 'skipping git-svn tests, svn not found' :
20+
test_expect_success 'skipping git svn tests, svn not found' :
2121
test_done
2222
exit
2323
fi
@@ -91,7 +91,7 @@ start_httpd () {
9191
mkdir "$GIT_DIR"/logs
9292

9393
cat > "$GIT_DIR/httpd.conf" <<EOF
94-
ServerName "git-svn test"
94+
ServerName "git svn test"
9595
ServerRoot "$GIT_DIR"
9696
DocumentRoot "$GIT_DIR"
9797
PidFile "$GIT_DIR/httpd.pid"

‎t/t9100-git-svn-basic.sh‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2006 Eric Wong
44
#
55

6-
test_description='git-svn basic tests'
6+
test_description='git svn basic tests'
77
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
88

99
case "$GIT_SVN_LC_ALL" in
@@ -17,7 +17,7 @@ esac
1717

1818
. ./lib-git-svn.sh
1919

20-
say 'define NO_SVN_TESTS to skip git-svn tests'
20+
say 'define NO_SVN_TESTS to skip git svn tests'
2121

2222
test_expect_success \
2323
'initialize git-svn' '
@@ -34,11 +34,11 @@ test_expect_success \
3434
svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
3535
cd .. &&
3636
rm -rf import &&
37-
git-svn init "$svnrepo"'
37+
git svn init "$svnrepo"'
3838

3939
test_expect_success \
4040
'import an SVN revision into git' \
41-
'git-svn fetch'
41+
'git svn fetch'
4242

4343
test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
4444

@@ -49,7 +49,7 @@ test_expect_success "$name" '
4949
cp dir/file file &&
5050
git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
5151
git commit -m "$name" &&
52-
git-svn set-tree --find-copies-harder --rmdir \
52+
git svn set-tree --find-copies-harder --rmdir \
5353
${remotes_git_svn}..mybranch &&
5454
svn up "$SVN_TREE" &&
5555
test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
@@ -63,7 +63,7 @@ test_expect_success "$name" "
6363
git update-index --remove dir/file &&
6464
git update-index --add dir/file/file &&
6565
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 \
6767
${remotes_git_svn}..mybranch" || true
6868

6969

@@ -77,7 +77,7 @@ test_expect_success "$name" '
7777
git update-index --remove -- bar/zzz &&
7878
git update-index --add -- bar &&
7979
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 \
8181
${remotes_git_svn}..mybranch2' || true
8282

8383

@@ -91,7 +91,7 @@ test_expect_success "$name" '
9191
echo yyy > bar/zzz/yyy &&
9292
git update-index --add bar/zzz/yyy &&
9393
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 \
9595
${remotes_git_svn}..mybranch3' || true
9696

9797

@@ -105,7 +105,7 @@ test_expect_success "$name" '
105105
echo asdf > dir &&
106106
git update-index --add -- dir &&
107107
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 \
109109
${remotes_git_svn}..mybranch4' || true
110110

111111

@@ -116,7 +116,7 @@ test_expect_success "$name" '
116116
chmod -x exec.sh &&
117117
git update-index exec.sh &&
118118
git commit -m "$name" &&
119-
git-svn set-tree --find-copies-harder --rmdir \
119+
git svn set-tree --find-copies-harder --rmdir \
120120
${remotes_git_svn}..mybranch5 &&
121121
svn up "$SVN_TREE" &&
122122
test ! -x "$SVN_TREE"/exec.sh'
@@ -127,7 +127,7 @@ test_expect_success "$name" '
127127
chmod +x exec.sh &&
128128
git update-index exec.sh &&
129129
git commit -m "$name" &&
130-
git-svn set-tree --find-copies-harder --rmdir \
130+
git svn set-tree --find-copies-harder --rmdir \
131131
${remotes_git_svn}..mybranch5 &&
132132
svn up "$SVN_TREE" &&
133133
test -x "$SVN_TREE"/exec.sh'
@@ -139,7 +139,7 @@ test_expect_success "$name" '
139139
ln -s bar/zzz exec.sh &&
140140
git update-index exec.sh &&
141141
git commit -m "$name" &&
142-
git-svn set-tree --find-copies-harder --rmdir \
142+
git svn set-tree --find-copies-harder --rmdir \
143143
${remotes_git_svn}..mybranch5 &&
144144
svn up "$SVN_TREE" &&
145145
test -L "$SVN_TREE"/exec.sh'
@@ -151,7 +151,7 @@ test_expect_success "$name" '
151151
ln -s bar/zzz exec-2.sh &&
152152
git update-index --add bar/zzz exec-2.sh &&
153153
git commit -m "$name" &&
154-
git-svn set-tree --find-copies-harder --rmdir \
154+
git svn set-tree --find-copies-harder --rmdir \
155155
${remotes_git_svn}..mybranch5 &&
156156
svn up "$SVN_TREE" &&
157157
test -x "$SVN_TREE"/bar/zzz &&
@@ -164,7 +164,7 @@ test_expect_success "$name" '
164164
cp help exec-2.sh &&
165165
git update-index exec-2.sh &&
166166
git commit -m "$name" &&
167-
git-svn set-tree --find-copies-harder --rmdir \
167+
git svn set-tree --find-copies-harder --rmdir \
168168
${remotes_git_svn}..mybranch5 &&
169169
svn up "$SVN_TREE" &&
170170
test -f "$SVN_TREE"/exec-2.sh &&
@@ -180,7 +180,7 @@ then
180180
echo '# hello' >> exec-2.sh &&
181181
git update-index exec-2.sh &&
182182
git commit -m 'éï∏' &&
183-
git-svn set-tree HEAD"
183+
git svn set-tree HEAD"
184184
unset LC_ALL
185185
else
186186
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'
190190
GIT_SVN_ID=alt
191191
export GIT_SVN_ID
192192
test_expect_success "$name" \
193-
'git-svn init "$svnrepo" && git-svn fetch &&
193+
'git svn init "$svnrepo" && git svn fetch &&
194194
git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
195195
git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
196196
test_cmp a b'
@@ -216,52 +216,52 @@ test_expect_success "$name" "test_cmp a expected"
216216
test_expect_success 'exit if remote refs are ambigious' "
217217
git config --add svn-remote.svn.fetch \
218218
bar:refs/${remotes_git_svn} &&
219-
test_must_fail git-svn migrate
219+
test_must_fail git svn migrate
220220
"
221221

222222
test_expect_success 'exit if init-ing a would clobber a URL' '
223223
svnadmin create "${PWD}/svnrepo2" &&
224224
svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
225225
git config --unset svn-remote.svn.fetch \
226226
"^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"
228228
'
229229

230230
test_expect_success \
231231
'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" &&
233233
git config --get svn-remote.svn.fetch \
234234
"^bar:refs/remotes/bar$" &&
235235
git config --get svn-remote.svn.fetch \
236236
"^:refs/${remotes_git_svn}$"
237237
'
238238

239239
test_expect_success 'able to dcommit to a subdirectory' "
240-
git-svn fetch -i bar &&
240+
git svn fetch -i bar &&
241241
git checkout -b my-bar refs/remotes/bar &&
242242
echo abc > d &&
243243
git update-index --add d &&
244244
git commit -m '/bar/d should be in the log' &&
245-
git-svn dcommit -i bar &&
245+
git svn dcommit -i bar &&
246246
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
247247
mkdir newdir &&
248248
echo new > newdir/dir &&
249249
git update-index --add newdir/dir &&
250250
git commit -m 'add a new directory' &&
251-
git-svn dcommit -i bar &&
251+
git svn dcommit -i bar &&
252252
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
253253
echo foo >> newdir/dir &&
254254
git update-index newdir/dir &&
255255
git commit -m 'modify a file in new directory' &&
256-
git-svn dcommit -i bar &&
256+
git svn dcommit -i bar &&
257257
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
258258
"
259259

260260
test_expect_success 'able to set-tree to a subdirectory' "
261261
echo cba > d &&
262262
git update-index d &&
263263
git commit -m 'update /bar/d' &&
264-
git-svn set-tree -i bar HEAD &&
264+
git svn set-tree -i bar HEAD &&
265265
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
266266
"
267267

‎t/t9101-git-svn-props.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2006 Eric Wong
44
#
55

6-
test_description='git-svn property tests'
6+
test_description='git svn property tests'
77
. ./lib-git-svn.sh
88

99
mkdir import
@@ -66,15 +66,15 @@ test_expect_success 'setup some commits to svn' \
6666
svn commit -m "Propset Id" &&
6767
cd ..'
6868

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'
7171

7272
name='test svn:keywords ignoring'
7373
test_expect_success "$name" \
7474
'git checkout -b mybranch ${remotes_git_svn} &&
7575
echo Hi again >> kw.c &&
7676
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 &&
7878
git pull . ${remotes_git_svn}'
7979

8080
expect='/* $Id$ */'
@@ -90,7 +90,7 @@ test_expect_success "propset CR on crlf files" \
9090
cd ..'
9191

9292
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
93-
'git-svn fetch &&
93+
'git svn fetch &&
9494
git pull . ${remotes_git_svn} &&
9595
svn co "$svnrepo" new_wc'
9696

@@ -113,7 +113,7 @@ cd test_wc
113113
svn commit -m "propset CRLF on cr files"'
114114
cd ..
115115
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}'
117117

118118
b_cr="`git-hash-object cr`"
119119
b_ne_cr="`git-hash-object ne_cr`"
@@ -145,7 +145,7 @@ test_expect_success 'test show-ignore' "
145145
svn propset -R svn:ignore 'no-such-file*' .
146146
svn commit -m 'propset svn:ignore'
147147
cd .. &&
148-
git-svn show-ignore > show-ignore.got &&
148+
git svn show-ignore > show-ignore.got &&
149149
cmp show-ignore.expect show-ignore.got
150150
"
151151

@@ -161,8 +161,8 @@ cat >create-ignore-index.expect <<\EOF
161161
EOF
162162

163163
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 &&
166166
cmp ./.gitignore create-ignore.expect &&
167167
cmp ./deeply/.gitignore create-ignore.expect &&
168168
cmp ./deeply/nested/.gitignore create-ignore.expect &&
@@ -182,15 +182,15 @@ EOF
182182
# pattern, it can pass even though the propget did not execute on the
183183
# right directory.
184184
test_expect_success 'test propget' "
185-
git-svn propget svn:ignore . | cmp - prop.expect &&
185+
git svn propget svn:ignore . | cmp - prop.expect &&
186186
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 \
189189
| 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
194194
"
195195

196196
cat >prop.expect <<\EOF
@@ -210,8 +210,8 @@ Properties on 'nested/directory/.keep':
210210
EOF
211211

212212
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
215215
"
216216

217217
test_done

‎t/t9102-git-svn-deep-rmdir.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
test_description='git-svn rmdir'
2+
test_description='git svn rmdir'
33
. ./lib-git-svn.sh
44

55
test_expect_success 'initialize repo' '
@@ -14,15 +14,15 @@ test_expect_success 'initialize repo' '
1414
'
1515

1616
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 &&
1919
git checkout -f -b test-rmdir ${remotes_git_svn}
2020
'
2121

2222
test_expect_success 'Try a commit on rmdir' '
2323
git rm -f deeply/nested/directory/number/2/another &&
2424
git commit -a -m "remove another" &&
25-
git-svn set-tree --rmdir HEAD &&
25+
git svn set-tree --rmdir HEAD &&
2626
svn ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
2727
'
2828

‎t/t9103-git-svn-tracked-directory-removed.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2007 Eric Wong
44
#
55

6-
test_description='git-svn tracking removed top-level path'
6+
test_description='git svn tracking removed top-level path'
77
. ./lib-git-svn.sh
88

99
test_expect_success 'make history for tracking' '

0 commit comments

Comments
 (0)