0
@@ -180,18 +180,28 @@ class Repository < ActiveRecord::Base
0
   # TODO: caching
0
   def commit_graph_data_by_author(head = "master")
0
     h = {}
0
-    count_author_regexp = /^\s+(\d+)\s(.+)$/.freeze
0
-    data = self.git.git.shortlog({:s => true }, head)
0
+    emails = {}
0
+    count_author_regexp = /^\s+(\d+)\s(.+)\s\<(\S+)\>$/.freeze
0
+    data = self.git.git.shortlog({:e => true, :s => true }, head)
0
     data.each_line do |line|
0
       if line =~ count_author_regexp
0
         count = $1.to_i
0
         author = $2
0
+        email = $3
0
         
0
         h[author] ||= 0
0
         h[author] += count
0
+        
0
+        emails[email] = author
0
       end
0
     end
0
     
0
+    users = User.find(:all, :conditions => ["email in (?)", emails.keys])
0
+    users.each do |user|
0
+      author_name = emails[user.email]
0
+      h[user.login] = h.delete(author_name)
0
+    end
0
+    
0
     h
0
   end
0