Make commits from git-import-dsc get author and date from debian/changelog.

This is done by setting GIT_AUTHOR_{NAME,EMAIL,DATE} before invoking
git-commit. GIT_COMMITTER_* are left alone (i.e., the date of the import
will be available from there).
(cherry picked from commit acee866d1d89327aa530b6531b50b4edcc524906)

1 files changed, 11 insertions, 3 deletions

diff --git a/git-import-dsc b/git-import-dsc
index 87fd90f2..442cbc1f 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -23,9 +23,10 @@ import os
 import tempfile
 import glob
 import pipes
+from email.Utils import parseaddr
 import gbp.command_wrappers as gbpc
-from gbp.deb_utils import debian_version_chars, unpack_orig
-from gbp.git_utils import build_tag, GitRepository, GitRepositoryError, replace_source_tree
+from gbp.deb_utils import debian_version_chars, parse_changelog, unpack_orig
+from gbp.git_utils import build_tag, GitRepository, GitRepositoryError, replace_source_tree, rfc822_date_to_git
 from gbp.config import GbpOptionParser
 from gbp.errors import GbpError
 
@@ -145,7 +146,14 @@ def apply_debian_patch(src, dirs, options):
             raise GbpError
         os.chmod('debian/rules', 0755)
         if not repo.is_clean()[0]:
-            gbpc.GitCommitAll()(msg="Imported Debian patch %s" % version)
+            dch = parse_changelog('debian/changelog')
+            name, addr = parseaddr(dch['Maintainer'])
+            env = {
+                'GIT_AUTHOR_NAME': name,
+                'GIT_AUTHOR_EMAIL': addr,
+                'GIT_AUTHOR_DATE': rfc822_date_to_git(dch['Date']),
+            }
+            gbpc.GitCommitAll(extra_env=env)(msg="Imported Debian patch %s" % version)
         else:
             print "Nothing to commit, nothing imported."
         gitTag(build_tag(options.debian_tag, version),