diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-11 01:48:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-11 01:48:04 +0400 |
| commit | ffcc952b33575e28b971d63ba2b7e46b7726a257 (patch) | |
| tree | 4429a3b7a1479945407f0f35d173d6e70026ed21 /contrib | |
| parent | 63fcbe00a66d7cb7d8bce9a36120a19a809a33b8 (diff) | |
| parent | a9d9a1bfdddd5f177617abc943fba10f6cc68066 (diff) | |
Merge branch 'maint'
* maint:
Fix documentation of tag in git-fast-import.txt
Properly handle '0' filenames in import-tars
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 a43b2c52f0..1e6fa5a15c 100755 --- a/contrib/fast-import/import-tars.perl +++ b/contrib/fast-import/import-tars.perl @@ -51,7 +51,7 @@ foreach my $tar_file (@ARGV) $prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12 Z8 Z1 Z100 Z6 Z2 Z32 Z32 Z8 Z8 Z*', $_; - last unless $name; + last unless length($name); if ($name eq '././@LongLink') { # GNU tar extension if (read(I, $_, 512) != 512) { |