Merge branch 'master' of git://repo.or.cz/git-gui
[gitweb.git] / contrib / fast-import / import-tars.perl
index a43b2c52f05dc32183dbde422d091279b8e03042..23aeb257b9557cb146586868084ce1b20d7e7ac8 100755 (executable)
@@ -51,7 +51,7 @@
                        $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 @@
                $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) {