Andrew's git / gitweb.git / diff
?
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
authorJunio C Hamano <junkio@cox.net>
Wed, 16 May 2007 19:13:55 +0000 (12:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 16 May 2007 19:13:55 +0000 (12:13 -0700)
* 'maint' of git://repo.or.cz/git/fastimport:
import-tars: Use the "Link indicator" to identify directories

contrib/fast-import/import-tars.perl patch | blob | history
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index f0b9a43abd469caa75d513b1f1a729714d1d899c..5bfd205225a65bb4909cb44c305fb6235518d52a 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) {