Allow entries without email address in user map.

2 files changed, 3 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index c9aa26e..68d380d 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,8 @@ Bug fixes
 * Support new marks file format introduced in (apparently) git 1.6.
   (Ian Clatworthy, Jelmer Vernooij, Gabriel Filion, #347729)
 
+* Allow entries without email address in user map. (Jelmer Vernooij, #576598)
+
 0.9 28-Feb-2010
 ===============
 
diff --git a/user_mapper.py b/user_mapper.py
index 4fcf4a4..9bde2cf 100644
--- a/user_mapper.py
+++ b/user_mapper.py
@@ -58,7 +58,7 @@ class UserMapper(object):
 
     def _parse_id(self, id):
         if id.find('<') == -1:
-            return id, None
+            return id, ""
         else:
             return Utils.parseaddr(id)
 
@@ -77,5 +77,4 @@ class UserMapper(object):
                 new_email = "%s@%s" % (name, self._default_domain)
             else:
                 new_email = email
-        #print "converted '%s <%s>' to '%s <%s>'" % (name, email, new_name, new_email)
         return new_name, new_email