X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-svnimport.perl;h=61f559f0a8ae69c04cfe9d8700591cedda41989c;hb=f3dd5eae58cf3d0d944604af4c71a7043d5368fd;hp=4d5371ca901cb7579e454443958e8ca360763dbe;hpb=fcedc5a98643cedceb7e7ad3ddb5e3a5aa3dc593;p=git.git

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 4d5371ca..61f559f0 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -98,6 +98,7 @@ package SVNconn;
 use File::Spec;
 use File::Temp qw(tempfile);
 use POSIX qw(strftime dup2);
+use Fcntl qw(SEEK_SET);
 
 sub new {
 	my($what,$repo) = @_;
@@ -135,17 +136,32 @@ sub file {
 
 	print "... $rev $path ...\n" if $opt_v;
 	my (undef, $properties);
+	my $pool = SVN::Pool->new();
 	eval { (undef, $properties)
-		   = $self->{'svn'}->get_file($path,$rev,$fh); };
+		   = $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
+	$pool->clear;
 	if($@) {
 		return undef if $@ =~ /Attempted to get checksum/;
 		die $@;
 	}
 	my $mode;
 	if (exists $properties->{'svn:executable'}) {
-		$mode = '0755';
+		$mode = '100755';
+	} elsif (exists $properties->{'svn:special'}) {
+		my ($special_content, $filesize);
+		$filesize = tell $fh;
+		seek $fh, 0, SEEK_SET;
+		read $fh, $special_content, $filesize;
+		if ($special_content =~ s/^link //) {
+			$mode = '120000';
+			seek $fh, 0, SEEK_SET;
+			truncate $fh, 0;
+			print $fh $special_content;
+		} else {
+			die "unexpected svn:special file encountered";
+		}
 	} else {
-		$mode = '0644';
+		$mode = '100644';
 	}
 	close ($fh);