From 296796f5f2dd00079c0c85d34882074abff07f5e Mon Sep 17 00:00:00 2001
From: Dmitrij Tejblum <tejblum@yandex-team.ru>
Date: Sun, 8 Feb 2015 13:23:55 +0300
Subject: 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.
---
 gbp/deb/changelog.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gbp/deb/changelog.py b/gbp/deb/changelog.py
index 356f74d7..b3c56efe 100644
--- 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)
-- 
cgit v1.2.3