import-tars: separate author from committer

The import-tars script is typically employed to (re)create the past
history of a project from stored tars. Although assigning authorship in
these cases can be a somewhat arbitrary process, it makes sense to set
the author to whoever created the tars in the first place (if it's
known), and (s)he can in general be different from the committer
(whoever is running the script).

Implement this by having separate author and committer data, making them
settable from the usual GIT_* environment variables.

Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 23aeb257b9557cb146586868084ce1b20d7e7ac8..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 $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)
 {
 
 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;
 
        $tar_file =~ m,([^/]+)$,;
        my $tar_name = $1;
 


@@ -39,7 +44,7 @@
                die "Unrecognized compression format: $tar_file\n";
        }
 
                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);
        my $next_mark = 1;
        my $have_top_dir = 1;
        my ($top_dir, %files);


@@ -92,7 +97,7 @@
                }
                $files{$path} = [$next_mark++, $mode];
 
                }
                $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;
                $path =~ m,^([^/]+)/,;
                $top_dir = $1 unless $top_dir;
                $have_top_dir = 0 if $top_dir ne $1;


@@ -100,6 +105,7 @@
 
        print FI <<EOF;
 commit $branch_ref
 
        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.
 committer $committer_name <$committer_email> $commit_time +0000
 data <<END_OF_COMMIT_MESSAGE
 Imported from $tar_file.


@@ -119,7 +125,7 @@
        print FI <<EOF;
 tag $tar_name
 from $branch_ref
        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
 data <<END_OF_TAG_MESSAGE
 Package $tar_name
 END_OF_TAG_MESSAGE