Merge branch 'maint'

* maint:
Fix documentation of tag in git-fast-import.txt
Properly handle '0' filenames in import-tars

diff --combined contrib/fast-import/import-tars.perl
index a43b2c52f05dc32183dbde422d091279b8e03042,f0b9a43abd469caa75d513b1f1a729714d1d899c..1e6fa5a15cce13a4bc679dd41f8723d244afa980
--- 1/contrib/fast-import/import-tars.perl
--- 2/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@@ -51,7 -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) {
@@@ -84,12 -84,7 +84,12 @@@
                }
                print FI "\n";
  
 -              my $path = "$prefix$name";
 +              my $path;
 +              if ($prefix) {
 +                      $path = "$prefix/$name";
 +              } else {
 +                      $path = "$name";
 +              }
                $files{$path} = [$next_mark++, $mode];
  
                $commit_time = $mtime if $mtime > $commit_time;