[PATCH] Proposal for git-svn

From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Jul 18, 2007, 21:07 UTC
Message-ID: <FAFA899D-EC45-4313-98ED-2D0A3FF37669@lrde.epita.fr>

Hello,

I'm importing many SVN repositories in Git and I ran across a problem: ufloat.h has mode 120000but is not a link

I've read the code and checked-out the revision where the problem occured and it turns out that some stupid user commited a broken symlink and I think that's where the problem came from. I'm proposing the following trivial change to let git-svn clone continue its work:

diff --git a/git-svn.perl b/git-svn.perl
index 01c3904..a82baf4 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2555,8 +2555,8 @@ sub close_file {
                 sysseek($fh, 0, 0) or croak $!;
                 if ($fb->{mode_b} == 120000) {
                         sysread($fh, my $buf, 5) == 5 or croak $!;
-                       $buf eq 'link ' or die "$path has mode 120000",
-                                              "but is not a link\n";
+                       $buf eq 'link ' or warn "$path has mode 120000",
+                                              " but is not a link\n";
                 }
                 defined(my $pid = open my $out,'-|') or die "Can't  
fork: $!\n";
                 if (!$pid) {

(I also added a whitespace because "120000but" does not look good :D)
I checked out the problematic revision in git and I see the broken  
symlink just like in SVN so I assume this change is correct.

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory