git-dch --git-author: separate author and email

Allow --git-author to work if either author or email is not specified
in the git config, taking the other config option into account.

diff --git a/gbp/deb/changelog.py b/gbp/deb/changelog.py
index 356f74d7e073f81e0b9b6ab678a62276a33cd326..b3c56efe8744e8dca52dd779409a616c2e282897 100644 (file)
--- a/gbp/deb/changelog.py
+++ b/gbp/deb/changelog.py
@@ -245,8 +245,10 @@ class ChangeLog(object):
             args.extend(["--release", "--no-force-save-on-release"])
             msg = None
 
-        if author and email:
-            env = {'DEBFULLNAME': author, 'DEBEMAIL': email}
+        if author:
+            env['DEBFULLNAME'] = author
+        if email:
+            env['DEBEMAIL'] = email
 
         if distribution:
             args.append("--distribution=%s" % distribution)