X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Ffast-import%2Fimport-tars.perl;h=23aeb257b9557cb146586868084ce1b20d7e7ac8;hb=3814c07498f87e7d27b55175ca2852fcc4cd27f4;hp=e46492048c75f4a3cda11c3bf7ca03889640e7b7;hpb=bff898b894815ad291b35d213f1c022d1d16a9b9;p=git.git

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index e46492048..23aeb257b 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -51,7 +51,7 @@ foreach my $tar_file (@ARGV)
 			$prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12
 			Z8 Z1 Z100 Z6
 			Z2 Z32 Z32 Z8 Z8 Z*', $_;
-		last unless $name;
+		last unless length($name);
 		if ($name eq '././@LongLink') {
 			# GNU tar extension
 			if (read(I, $_, 512) != 512) {
@@ -75,7 +75,7 @@ foreach my $tar_file (@ARGV)
 		$mode = oct $mode;
 		$size = oct $size;
 		$mtime = oct $mtime;
-		next if $mode & 0040000;
+		next if $typeflag == 5; # directory
 
 		print FI "blob\n", "mark :$next_mark\n", "data $size\n";
 		while ($size > 0 && read(I, $_, 512) == 512) {
@@ -84,7 +84,12 @@ foreach my $tar_file (@ARGV)
 		}
 		print FI "\n";
 
-		my $path = "$prefix$name";
+		my $path;
+		if ($prefix) {
+			$path = "$prefix/$name";
+		} else {
+			$path = "$name";
+		}
 		$files{$path} = [$next_mark++, $mode];
 
 		$commit_time = $mtime if $mtime > $commit_time;