summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-16 12:13:55 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-16 12:13:55 -0700
commitdf9f91f8738167becda7a80f0db0ba856cdc0ecb (patch)
treee378f6a9844adda84ba7781b05e78149d01213e3
parentgit name-rev writes beyond the end of malloc() with large generations (diff)
parentimport-tars: Use the "Link indicator" to identify directories (diff)
downloadtgif-df9f91f8738167becda7a80f0db0ba856cdc0ecb.tar.xz
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
* 'maint' of git://repo.or.cz/git/fastimport: import-tars: Use the "Link indicator" to identify directories
-rwxr-xr-xcontrib/fast-import/import-tars.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index f0b9a43abd..5bfd205225 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -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) {