summaryrefslogtreecommitdiff
path: root/lib/git/objects
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-10-27 20:51:07 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-10-27 20:51:07 +0200
commit1b6b9510e0724bfcb4250f703ddf99d1e4020bbc (patch)
treecc59bebcb6cbc6a1a9210e4ff123f2a256105261 /lib/git/objects
parent2c0b92e40ece170b59bced0cea752904823e06e7 (diff)
downloadgitpython-1b6b9510e0724bfcb4250f703ddf99d1e4020bbc.tar.gz
Fixed bug that would cause the author's email to be a generic default one, instead of the existing and valid. The rest of the ConfigParser handling is correct, as it reads all configuration files available to git
see http://github.com/Byron/GitPython/issues#issue/1
Diffstat (limited to 'lib/git/objects')
-rw-r--r--lib/git/objects/commit.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/objects/commit.py b/lib/git/objects/commit.py
index c7da01e8..58c82da2 100644
--- a/lib/git/objects/commit.py
+++ b/lib/git/objects/commit.py
@@ -52,8 +52,8 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable):
env_email = "EMAIL"
# CONFIGURATION KEYS
- conf_email = 'email'
conf_name = 'name'
+ conf_email = 'email'
conf_encoding = 'i18n.commitencoding'
# INVARIANTS
@@ -294,7 +294,7 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable):
conf_email = cr.get_value('user', cls.conf_email, default_email)
author_name = env.get(cls.env_author_name, conf_name)
- author_email = env.get(cls.env_author_email, default_email)
+ author_email = env.get(cls.env_author_email, conf_email)
committer_name = env.get(cls.env_committer_name, conf_name)
committer_email = env.get(cls.env_committer_email, conf_email)