diff options
| -rwxr-xr-x | lorry.tar-importer | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lorry.tar-importer b/lorry.tar-importer index eb17ef2..904f8d8 100755 --- a/lorry.tar-importer +++ b/lorry.tar-importer @@ -29,10 +29,10 @@ die "usage: import-tars [--metainfo=extension] *.tar.{gz,bz2,lzma,xz,Z}\n" my $branch_name = 'master'; my $branch_ref = "refs/heads/$branch_name"; my $old_sha = `git show-ref $branch_ref 2>/dev/null`; -my $author_name = $ENV{'GIT_AUTHOR_NAME'} || 'Lorry Tar Creator'; -my $author_email = $ENV{'GIT_AUTHOR_EMAIL'} || 'lorry-tar-importer@baserock.org'; -my $committer_name = $ENV{'GIT_COMMITTER_NAME'} || `git config --get user.name`; -my $committer_email = $ENV{'GIT_COMMITTER_EMAIL'} || `git config --get user.email`; +my $author_name = 'Lorry Tar Creator'; +my $author_email = 'lorry-tar-importer@lorry'; +my $committer_name = $author_name; +my $committer_email = $author_email; chomp($committer_name, $committer_email, $old_sha); @@ -130,7 +130,7 @@ foreach my $tar_file (@ARGV) $have_top_dir = 0 if $top_dir ne $1; } - my $commit_msg = "Imported from $tar_file."; + my $commit_msg = $tar_name; my $this_committer_name = $committer_name; my $this_committer_email = $committer_email; my $this_author_name = $author_name; @@ -164,7 +164,7 @@ foreach my $tar_file (@ARGV) print FI <<EOF; commit $branch_ref author $this_author_name <$this_author_email> $author_time +0000 -committer $this_committer_name <$this_committer_email> $commit_time +0000 +committer $this_committer_name <$this_committer_email> $author_time +0000 data <<END_OF_COMMIT_MESSAGE $commit_msg END_OF_COMMIT_MESSAGE |