Browse Source

import-tars: support symlinks

Without this patch, symbolic links are turned into empty files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 16 years ago committed by Junio C Hamano
parent
commit
6fb37f86bc
  1. 17
      contrib/fast-import/import-tars.perl

17
contrib/fast-import/import-tars.perl

@ -82,10 +82,16 @@ foreach my $tar_file (@ARGV)
$mtime = oct $mtime; $mtime = oct $mtime;
next if $typeflag == 5; # directory next if $typeflag == 5; # directory


print FI "blob\n", "mark :$next_mark\n", "data $size\n"; print FI "blob\n", "mark :$next_mark\n";
while ($size > 0 && read(I, $_, 512) == 512) { if ($typeflag == 2) { # symbolic link
print FI substr($_, 0, $size); print FI "data ", length($linkname), "\n", $linkname;
$size -= 512; $mode = 0120000;
} else {
print FI "data $size\n";
while ($size > 0 && read(I, $_, 512) == 512) {
print FI substr($_, 0, $size);
$size -= 512;
}
} }
print FI "\n"; print FI "\n";


@ -118,7 +124,8 @@ EOF
{ {
my ($mark, $mode) = @{$files{$path}}; my ($mark, $mode) = @{$files{$path}};
$path =~ s,^([^/]+)/,, if $have_top_dir; $path =~ s,^([^/]+)/,, if $have_top_dir;
printf FI "M %o :%i %s\n", $mode & 0111 ? 0755 : 0644, $mark, $path; $mode = $mode & 0111 ? 0755 : 0644 unless $mode == 0120000;
printf FI "M %o :%i %s\n", $mode, $mark, $path;
} }
print FI "\n"; print FI "\n";



Loading…
Cancel
Save