From 48e0acd6fb0f27a3ffb6996ecab9b0c5c00ec606 Mon Sep 17 00:00:00 2001
From: Heikki Hokkanen <hoxu@users.sf.net>
Date: Thu, 14 Jan 2010 17:53:42 +0200
Subject: [PATCH] Fixed handling of weird author e-mails.

Commit e5fc428ecf3b23ed6b1a640bbddff9a59b251969 broke for linux-2.6 repository
for example, so we make a little bit more effort in handling weird e-mail
addresses. The linux-2.6 repository contains quite a few of these, some can be
found with the following command:

git rev-list --pretty=format:"%H %an <%aE>" HEAD | grep -v ^commit |grep -v '@'
---
 gitstats | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gitstats b/gitstats
index 744b8ce..591c55a 100755
--- a/gitstats
+++ b/gitstats
@@ -227,19 +227,20 @@ class GitDataCollector(DataCollector):
 				self.tags[tag]['authors'][author] = commits
 
 		# Collect revision statistics
-		# Outputs "<stamp> <author>"
-		lines = getpipeoutput(['git rev-list --pretty=format:"%at %ai %aE %an" HEAD', 'grep -v ^commit']).split('\n')
+		# Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
+		lines = getpipeoutput(['git rev-list --pretty=format:"%at %ai %an <%aE>" HEAD', 'grep -v ^commit']).split('\n')
 		for line in lines:
-			parts = line.split(' ')
+			parts = line.split(' ', 4)
 			author = ''
 			try:
 				stamp = int(parts[0])
 			except ValueError:
 				stamp = 0
 			timezone = parts[3]
-			domain = parts[4].rsplit('@', 1)[1]
-			if len(parts) > 5:
-				author = ' '.join(parts[5:])
+			author, mail = parts[4].split('<', 1)
+			author = author.rstrip()
+			mail = mail.rstrip('>')
+			domain = mail.rsplit('@', 1)[1]
 			date = datetime.datetime.fromtimestamp(float(stamp))
 
 			# First and last commit stamp
-- 
2.11.4.GIT