mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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>
This commit is contained in:
parent
c6d499a82f
commit
5bd3870c37
1 changed files with 35 additions and 49 deletions
|
@ -24,10 +24,7 @@ test_expect_success \
|
||||||
mkdir import &&
|
mkdir import &&
|
||||||
cd import &&
|
cd import &&
|
||||||
echo foo > foo &&
|
echo foo > foo &&
|
||||||
if test -z '$NO_SYMLINK'
|
ln -s foo foo.link
|
||||||
then
|
|
||||||
ln -s foo foo.link
|
|
||||||
fi
|
|
||||||
mkdir -p dir/a/b/c/d/e &&
|
mkdir -p dir/a/b/c/d/e &&
|
||||||
echo 'deep dir' > dir/a/b/c/d/e/file &&
|
echo 'deep dir' > dir/a/b/c/d/e/file &&
|
||||||
mkdir bar &&
|
mkdir bar &&
|
||||||
|
@ -136,48 +133,43 @@ test_expect_success "$name" "
|
||||||
test -x '$SVN_TREE'/exec.sh"
|
test -x '$SVN_TREE'/exec.sh"
|
||||||
|
|
||||||
|
|
||||||
if test -z "$NO_SYMLINK"
|
name='executable file becomes a symlink to bar/zzz (file)'
|
||||||
then
|
test_expect_success "$name" "
|
||||||
name='executable file becomes a symlink to bar/zzz (file)'
|
rm exec.sh &&
|
||||||
|
ln -s bar/zzz exec.sh &&
|
||||||
|
git update-index exec.sh &&
|
||||||
|
git commit -m '$name' &&
|
||||||
|
git-svn set-tree --find-copies-harder --rmdir \
|
||||||
|
remotes/git-svn..mybranch5 &&
|
||||||
|
svn up '$SVN_TREE' &&
|
||||||
|
test -L '$SVN_TREE'/exec.sh"
|
||||||
|
|
||||||
test_expect_success "$name" "
|
name='new symlink is added to a file that was also just made executable'
|
||||||
rm exec.sh &&
|
|
||||||
ln -s bar/zzz exec.sh &&
|
|
||||||
git update-index exec.sh &&
|
|
||||||
git commit -m '$name' &&
|
|
||||||
git-svn set-tree --find-copies-harder --rmdir \
|
|
||||||
remotes/git-svn..mybranch5 &&
|
|
||||||
svn up '$SVN_TREE' &&
|
|
||||||
test -L '$SVN_TREE'/exec.sh"
|
|
||||||
|
|
||||||
name='new symlink is added to a file that was also just made executable'
|
test_expect_success "$name" "
|
||||||
|
chmod +x bar/zzz &&
|
||||||
test_expect_success "$name" "
|
ln -s bar/zzz exec-2.sh &&
|
||||||
chmod +x bar/zzz &&
|
git update-index --add bar/zzz exec-2.sh &&
|
||||||
ln -s bar/zzz exec-2.sh &&
|
git commit -m '$name' &&
|
||||||
git update-index --add bar/zzz exec-2.sh &&
|
git-svn set-tree --find-copies-harder --rmdir \
|
||||||
git commit -m '$name' &&
|
remotes/git-svn..mybranch5 &&
|
||||||
git-svn set-tree --find-copies-harder --rmdir \
|
svn up '$SVN_TREE' &&
|
||||||
remotes/git-svn..mybranch5 &&
|
test -x '$SVN_TREE'/bar/zzz &&
|
||||||
svn up '$SVN_TREE' &&
|
test -L '$SVN_TREE'/exec-2.sh"
|
||||||
test -x '$SVN_TREE'/bar/zzz &&
|
|
||||||
test -L '$SVN_TREE'/exec-2.sh"
|
|
||||||
|
|
||||||
name='modify a symlink to become a file'
|
|
||||||
test_expect_success "$name" "
|
|
||||||
echo git help > help || true &&
|
|
||||||
rm exec-2.sh &&
|
|
||||||
cp help exec-2.sh &&
|
|
||||||
git update-index exec-2.sh &&
|
|
||||||
git commit -m '$name' &&
|
|
||||||
git-svn set-tree --find-copies-harder --rmdir \
|
|
||||||
remotes/git-svn..mybranch5 &&
|
|
||||||
svn up '$SVN_TREE' &&
|
|
||||||
test -f '$SVN_TREE'/exec-2.sh &&
|
|
||||||
test ! -L '$SVN_TREE'/exec-2.sh &&
|
|
||||||
diff -u help $SVN_TREE/exec-2.sh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
name='modify a symlink to become a file'
|
||||||
|
test_expect_success "$name" "
|
||||||
|
echo git help > help || true &&
|
||||||
|
rm exec-2.sh &&
|
||||||
|
cp help exec-2.sh &&
|
||||||
|
git update-index exec-2.sh &&
|
||||||
|
git commit -m '$name' &&
|
||||||
|
git-svn set-tree --find-copies-harder --rmdir \
|
||||||
|
remotes/git-svn..mybranch5 &&
|
||||||
|
svn up '$SVN_TREE' &&
|
||||||
|
test -f '$SVN_TREE'/exec-2.sh &&
|
||||||
|
test ! -L '$SVN_TREE'/exec-2.sh &&
|
||||||
|
diff -u help $SVN_TREE/exec-2.sh"
|
||||||
|
|
||||||
if test "$have_utf8" = t
|
if test "$have_utf8" = t
|
||||||
then
|
then
|
||||||
|
@ -203,12 +195,6 @@ test_expect_success "$name" \
|
||||||
git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
|
git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
|
||||||
diff -u a b"
|
diff -u a b"
|
||||||
|
|
||||||
if test -n "$NO_SYMLINK"
|
|
||||||
then
|
|
||||||
test_done
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
name='check imported tree checksums expected tree checksums'
|
name='check imported tree checksums expected tree checksums'
|
||||||
rm -f expected
|
rm -f expected
|
||||||
if test "$have_utf8" = t
|
if test "$have_utf8" = t
|
||||||
|
|
Loading…
Reference in a new issue