Update GPG key for signing flatpaks.

[pspp] / git-import-tar

diff --git a/git-import-tar b/git-import-tar
index 30cd9fa3b17f699b03a133ca567d00cc9f081ab4..13d70b1aa4e8aa07858f3c73aa8a60c1c4597fec 100755 (executable)
--- a/git-import-tar
+++ b/git-import-tar
@@ -55,11 +55,8 @@ if (! -e $tarball) {
       or die "$0: failed to open \"$tarball\": $!\n";
 }
 
-my $commit_user = `git config --get user.name`;
-chomp $commit_user;
-my $commit_email = `git config --get user.email`;
-chomp $commit_email;
-my $committer = "$commit_user <$commit_email>";
+my $committer_ident = `git var GIT_COMMITTER_IDENT`;
+chomp $committer_ident;
 
 open (GFI, "|-", "git fast-import --date-format=raw --quiet")
   or die "$0: \"git fast-import\" failed to start: $!\n";
@@ -114,7 +111,7 @@ for (;;) {
 my $commit = $mark++;
 print GFI "commit $branch\n";
 print GFI "mark :$commit\n";
-print GFI "committer $committer ", time(), " +0000\n";
+print GFI "committer $committer_ident\n";
 print GFI "data ", length($message), "\n";
 print GFI $message, "\n";
 print GFI "merge $branch^0\n" if !$new_branch;