aboutsummaryrefslogtreecommitdiff
path: root/t/t9131-git-svn-empty-symlink.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-11 10:20:12 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-11 10:20:12 -0800
commit7b73d828f02e885f4e9619ff1a2b43e3d8dcf259 (patch)
tree8838c26a9f63055c6ad24abf17c1ad97c5e977f3 /t/t9131-git-svn-empty-symlink.sh
parent9e5b80cd87a511f3403b6f88f87ef40844695f6b (diff)
parent39111f6b7aeb5a7bc57731a6c8f0c3b8178873c8 (diff)
downloadgit-7b73d828f02e885f4e9619ff1a2b43e3d8dcf259.tar.gz
git-7b73d828f02e885f4e9619ff1a2b43e3d8dcf259.tar.xz
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: test case for regression caused by git-svn empty symlink fix git-svn: fix broken symlink workaround when switching branches git-svn: Print revision while searching for earliest use of path git-svn: abstract out a block into new method other_gs() git-svn: allow disabling expensive broken symlink checks
Diffstat (limited to 't/t9131-git-svn-empty-symlink.sh')
-rwxr-xr-xt/t9131-git-svn-empty-symlink.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t9131-git-svn-empty-symlink.sh b/t/t9131-git-svn-empty-symlink.sh
index 704a4f857..20529a878 100755
--- a/t/t9131-git-svn-empty-symlink.sh
+++ b/t/t9131-git-svn-empty-symlink.sh
@@ -87,4 +87,14 @@ test_expect_success '"bar" is an empty file' 'test -f x/bar && ! test -s x/bar'
test_expect_success 'get "bar" => symlink fix from svn' \
'(cd x && git svn rebase)'
test_expect_success '"bar" becomes a symlink' 'test -L x/bar'
+
+
+test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" y'
+test_expect_success 'disable broken symlink workaround' \
+ '(cd y && git config svn.brokenSymlinkWorkaround false)'
+test_expect_success '"bar" is an empty file' 'test -f y/bar && ! test -s y/bar'
+test_expect_success 'get "bar" => symlink fix from svn' \
+ '(cd y && git svn rebase)'
+test_expect_success '"bar" does not become a symlink' '! test -L y/bar'
+
test_done