git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
We don't support the svn command-line client anymore; nor do we support anything before SVN 1.1.0, so we can be certain symlinks will be supported in the SVN repository. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Dec 31, 2006 at 21:49 UTC
5bd3870c37dfb613e5e055f7b6d4c80a7b823719
1 file changed
+35
-49
t/t9100-git-svn-basic.sh
+35
-49
@@ -24,10 +24,7 @@ test_expect_success \
24
mkdir import &&
25
cd import &&
26
echo foo > foo &&
27
- if test -z '$NO_SYMLINK'
28
- then
29
- ln -s foo foo.link
30
- fi
27
+ ln -s foo foo.link
28
mkdir -p dir/a/b/c/d/e &&
29
echo 'deep dir' > dir/a/b/c/d/e/file &&
30
mkdir bar &&
@@ -136,48 +133,43 @@ test_expect_success "$name" "
133
test -x '$SVN_TREE'/exec.sh"
134
135
139
-if test -z "$NO_SYMLINK"
140
-then
141
- name='executable file becomes a symlink to bar/zzz (file)'
142
-
143
- test_expect_success "$name" "
144
- rm exec.sh &&
145
- ln -s bar/zzz exec.sh &&
146
- git update-index exec.sh &&
147
- git commit -m '$name' &&
148
- git-svn set-tree --find-copies-harder --rmdir \
149
- remotes/git-svn..mybranch5 &&
150
- svn up '$SVN_TREE' &&
151
- test -L '$SVN_TREE'/exec.sh"
136
+name='executable file becomes a symlink to bar/zzz (file)'
137
+test_expect_success "$name" "
138
+ rm exec.sh &&
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 \
143
+ remotes/git-svn..mybranch5 &&
144
+ svn up '$SVN_TREE' &&
145
+ test -L '$SVN_TREE'/exec.sh"
146
153
- name='new symlink is added to a file that was also just made executable'
147
+name='new symlink is added to a file that was also just made executable'
148
155
- test_expect_success "$name" "
156
- chmod +x bar/zzz &&
157
- ln -s bar/zzz exec-2.sh &&
158
- git update-index --add bar/zzz exec-2.sh &&
159
- git commit -m '$name' &&
160
- git-svn set-tree --find-copies-harder --rmdir \
161
- remotes/git-svn..mybranch5 &&
162
- svn up '$SVN_TREE' &&
163
- test -x '$SVN_TREE'/bar/zzz &&
164
- test -L '$SVN_TREE'/exec-2.sh"
165
-
166
- name='modify a symlink to become a file'
167
- test_expect_success "$name" "
168
- echo git help > help || true &&
169
- rm exec-2.sh &&
170
- cp help exec-2.sh &&
171
- git update-index exec-2.sh &&
172
- git commit -m '$name' &&
173
- git-svn set-tree --find-copies-harder --rmdir \
174
- remotes/git-svn..mybranch5 &&
175
- svn up '$SVN_TREE' &&
176
- test -f '$SVN_TREE'/exec-2.sh &&
177
- test ! -L '$SVN_TREE'/exec-2.sh &&
178
- diff -u help $SVN_TREE/exec-2.sh"
179
-fi
149
+test_expect_success "$name" "
150
+ chmod +x bar/zzz &&
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 \
155
+ remotes/git-svn..mybranch5 &&
156
+ svn up '$SVN_TREE' &&
157
+ test -x '$SVN_TREE'/bar/zzz &&
158
+ test -L '$SVN_TREE'/exec-2.sh"
159
160
+name='modify a symlink to become a file'
161
+test_expect_success "$name" "
162
+ echo git help > help || true &&
163
+ rm exec-2.sh &&
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 \
168
+ remotes/git-svn..mybranch5 &&
169
+ svn up '$SVN_TREE' &&
170
+ test -f '$SVN_TREE'/exec-2.sh &&
171
+ test ! -L '$SVN_TREE'/exec-2.sh &&
172
+ diff -u help $SVN_TREE/exec-2.sh"
173
174
if test "$have_utf8" = t
175
then
@@ -203,12 +195,6 @@ test_expect_success "$name" \
195
git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
196
diff -u a b"
197
206
-if test -n "$NO_SYMLINK"
207
-then
208
- test_done
209
- exit 0
210
-fi
211
-
198
name='check imported tree checksums expected tree checksums'
199
rm -f expected
200
if test "$have_utf8" = t