Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 1e6fa5a15cce13a4bc679dd41f8723d244afa980..23aeb257b9557cb146586868084ce1b20d7e7ac8 100755 (executable)
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -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) {