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

Byron · Byron · commit 1b6b9510e072 · 2010-10-27T20:51:07.000+02:00
see http://github.com/Byron/GitPython/issues#issue/1
diff --git a/lib/git/config.py b/lib/git/config.py
@@ -136,7 +136,7 @@ def __init__(self, file_or_files, read_only=True):
 			# initialize lock base - we want to write
 			self._lock = self.t_lock(file_or_files)
 			
-			self._lock._obtain_lock()	
+			self._lock._obtain_lock()
 		# END read-only check
 		
 	
diff --git 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 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False):
 		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)
diff --git a/test/git/test_index.py b/test/git/test_index.py
@@ -353,6 +353,11 @@ def test_index_mutation(self, rw_repo):
 		num_entries = len(index.entries)
 		cur_head = rw_repo.head
 		
+		uname = "Some Developer"
+		umail = "sd@company.com"
+		rw_repo.config_writer().set_value("user", "name", uname)
+		rw_repo.config_writer().set_value("user", "email", umail) 
+		
 		# remove all of the files, provide a wild mix of paths, BaseIndexEntries, 
 		# IndexEntries
 		def mixed_iterator():
@@ -404,6 +409,10 @@ def mixed_iterator():
 		commit_message = "commit default head"
 		
 		new_commit = index.commit(commit_message, head=False)
+		assert new_commit.author.name == uname
+		assert new_commit.author.email == umail
+		assert new_commit.committer.name == uname
+		assert new_commit.committer.email == umail
 		assert new_commit.message == commit_message
 		assert new_commit.parents[0] == cur_commit
 		assert len(new_commit.parents) == 1
