diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2009-02-27 19:40:16 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-02-27 21:53:09 -0800 |
| commit | 48679e5c2d059b9b198d6f414dd80aa921d23002 (patch) | |
| tree | 1859f0a1ffb81e664087ee3a3f89bf2272351c87 | |
| parent | Merge branch 'cc/maint-1.6.0-bisect-fix' (diff) | |
| download | tgif-48679e5c2d059b9b198d6f414dd80aa921d23002.tar.xz | |
git-svn: disable broken symlink workaround by default
Even though this will break things for some extremely rare repositories
used by broken Windows clients, it's probably not worth enabling this by
default as it has negatively affected many more users than it has helped
from what we've seen so far.
The extremely rare repositories that have broken symlinks in them will be
silently corrupted in import; but users can still reenable this option and
restart the import.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-svn.perl | 2 | ||||
| -rwxr-xr-x | t/t9131-git-svn-empty-symlink.sh | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index d967594ee7..a676a4c78e 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3297,7 +3297,7 @@ sub new { sub _mark_empty_symlinks { my ($git_svn, $switch_path) = @_; my $bool = Git::config_bool('svn.brokenSymlinkWorkaround'); - return {} if (defined($bool) && ! $bool); + return {} if (!defined($bool)) || (defined($bool) && ! $bool); my %ret; my ($rev, $cmt) = $git_svn->last_rev_commit; diff --git a/t/t9131-git-svn-empty-symlink.sh b/t/t9131-git-svn-empty-symlink.sh index 20529a878c..8f35e294aa 100755 --- a/t/t9131-git-svn-empty-symlink.sh +++ b/t/t9131-git-svn-empty-symlink.sh @@ -83,6 +83,8 @@ EOF ' test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" x' +test_expect_success 'enable broken symlink workaround' \ + '(cd x && git config svn.brokenSymlinkWorkaround true)' 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)' @@ -97,4 +99,12 @@ 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' +# svn.brokenSymlinkWorkaround is unset +test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" z' +test_expect_success '"bar" is an empty file' 'test -f z/bar && ! test -s z/bar' +test_expect_success 'get "bar" => symlink fix from svn' \ + '(cd z && git svn rebase)' +test_expect_success '"bar" does not become a symlink' '! test -L z/bar' + + test_done |