diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-16 12:13:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-16 12:13:55 -0700 |
| commit | df9f91f8738167becda7a80f0db0ba856cdc0ecb (patch) | |
| tree | e378f6a9844adda84ba7781b05e78149d01213e3 | |
| parent | cf606e3ddd8666b990a6560be77eb9f28af0e47d (diff) | |
| parent | df8cfac815a1fae75afd20a86beb194d9d947971 (diff) | |
| download | git-df9f91f8738167becda7a80f0db0ba856cdc0ecb.tar.gz git-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-x | contrib/fast-import/import-tars.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl index f0b9a43ab..5bfd20522 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) { |