diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-16 12:43:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-16 12:43:05 -0700 |
| commit | fdcb769916c93b53517ef1b4cae447a3333c9b86 (patch) | |
| tree | 15900032ae854c16292e8d8e0b5d1f089b5c8263 /contrib | |
| parent | 7e431ef9ab933d7ff899a999e40627ab49774f3a (diff) | |
| parent | 0ab564be6e59c66c7aa4fc44997f3fc62ebcd0d9 (diff) | |
| download | git-fdcb769916c93b53517ef1b4cae447a3333c9b86.tar.gz git-fdcb769916c93b53517ef1b4cae447a3333c9b86.tar.xz | |
Merge branch 'maint'
* maint:
format-patch: add MIME-Version header when we add content-type.
Fixed link in user-manual
import-tars: Use the "Link indicator" to identify directories
git name-rev writes beyond the end of malloc() with large generations
Documentation/branch: fix small typo in -D example
Diffstat (limited to 'contrib')
| -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 1e6fa5a15..23aeb257b 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) { |