Merge branch 'js/maint-diff-temp-smudge'

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index d2363a415d5a1a7a77fede7f5573342f9a20e755..6309d146e74a428520d09cbff4dc8d9a429ec001 100755 (executable)
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -14,13 +14,18 @@
 
 my $branch_name = 'import-tars';
 my $branch_ref = "refs/heads/$branch_name";
-my $committer_name = 'T Ar Creator';
-my $committer_email = 'tar@example.com';
+my $author_name = $ENV{'GIT_AUTHOR_NAME'} || 'T Ar Creator';
+my $author_email = $ENV{'GIT_AUTHOR_EMAIL'} || 'tar@example.com';
+my $committer_name = $ENV{'GIT_COMMITTER_NAME'} || `git config --get user.name`;
+my $committer_email = $ENV{'GIT_COMMITTER_EMAIL'} || `git config --get user.email`;
+
+chomp($committer_name, $committer_email);
 
 open(FI, '|-', 'git', 'fast-import', '--quiet')
        or die "Unable to start git fast-import: $!\n";
 foreach my $tar_file (@ARGV)
 {
+       my $commit_time = time;
        $tar_file =~ m,([^/]+)$,;
        my $tar_name = $1;
 
@@ -39,7 +44,7 @@
                die "Unrecognized compression format: $tar_file\n";
        }
 
-       my $commit_time = 0;
+       my $author_time = 0;
        my $next_mark = 1;
        my $have_top_dir = 1;
        my ($top_dir, %files);
@@ -51,12 +56,31 @@
                        $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) {
+                               die ('Short archive');
+                       }
+                       $name = unpack 'Z257', $_;
+                       next unless $name;
+
+                       my $dummy;
+                       if (read(I, $_, 512) != 512) {
+                               die ('Short archive');
+                       }
+                       ($dummy, $mode, $uid, $gid, $size, $mtime,
+                       $chksum, $typeflag, $linkname, $magic,
+                       $version, $uname, $gname, $devmajor, $devminor,
+                       $prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12
+                       Z8 Z1 Z100 Z6
+                       Z2 Z32 Z32 Z8 Z8 Z*', $_;
+               }
                next if $name =~ m{/\z};
                $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) {
@@ -73,7 +97,7 @@
                }
                $files{$path} = [$next_mark++, $mode];
 
-               $commit_time = $mtime if $mtime > $commit_time;
+               $author_time = $mtime if $mtime > $author_time;
                $path =~ m,^([^/]+)/,;
                $top_dir = $1 unless $top_dir;
                $have_top_dir = 0 if $top_dir ne $1;
@@ -81,6 +105,7 @@
 
        print FI <<EOF;
 commit $branch_ref
+author $author_name <$author_email> $author_time +0000
 committer $committer_name <$committer_email> $commit_time +0000
 data <<END_OF_COMMIT_MESSAGE
 Imported from $tar_file.
@@ -100,7 +125,7 @@
        print FI <<EOF;
 tag $tar_name
 from $branch_ref
-tagger $committer_name <$committer_email> $commit_time +0000
+tagger $author_name <$author_email> $author_time +0000
 data <<END_OF_TAG_MESSAGE
 Package $tar_name
 END_OF_TAG_MESSAGE