Add Committer: field to the mail

holzman · holzman · commit b5d798f72306 · 2011-09-07T16:38:06.000-05:00
diff --git a/lib/git_commit_notifier/diff_to_html.rb b/lib/git_commit_notifier/diff_to_html.rb
@@ -313,16 +313,21 @@ def extract_diff_from_git_show_output(content)
     end
 
     def extract_commit_info_from_git_show_output(content)
-      result = { :message => [], :commit => '', :author => '', :date => '', :email => '' }
+      result = { :message => [], :commit => '', :author => '', :date => '', :email => '',
+      :committer => '', :commit_date => '', :committer_email => ''}
       content.split("\n").each do |line|
         if line =~ /^diff/ # end of commit info, return results
           return result
-        elsif line =~ /^commit/
+        elsif line =~ /^commit /
           result[:commit] = line[7..-1]
-        elsif line =~ /^Author/
+        elsif line =~ /^Author:/
           result[:author], result[:email] = author_name_and_email(line[8..-1])
-        elsif line =~ /^Date/
+        elsif line =~ /^AuthorDate:/
           result[:date] = line[8..-1]
+        elsif line =~ /^Commit:/
+          result[:commitauthor], result[:commit_email] = author_name_and_email(line[8..-1])
+        elsif line =~ /^CommitDate:/
+          result[:commit_date] = line[8..-1]
         elsif line =~ /^Merge/
           result[:merge] = line[7..-1]
         else
@@ -458,6 +463,8 @@ def diff_for_commit(commit)
       title += "<strong>Branch:</strong> #{CGI.escapeHTML(branch_name)}\n<br />"
       title += "<strong>Date:</strong> #{CGI.escapeHTML commit_info[:date]}\n<br />"
       title += "<strong>Author:</strong> #{CGI.escapeHTML(commit_info[:author])} &lt;#{commit_info[:email]}&gt;\n</div>"
+      title += "<strong>Committer:</strong> #{CGI.escapeHTML(commit_info[:committer])} &lt;#{commit_info[:commit_email]}&gt;\n</div>"
+
       text = "#{raw_diff}"
       text += "#{changed_files}\n\n\n"
 
diff --git a/lib/git_commit_notifier/git.rb b/lib/git_commit_notifier/git.rb
@@ -8,12 +8,13 @@ def from_shell(cmd)
 
     def show(rev, ignore_whitespace)
       gitopt = ""
+      gitopt += " --pretty=fuller"
       gitopt += " -w" if ignore_whitespace
       from_shell("git show #{rev.strip}#{gitopt}")
     end
 
     def log(rev1, rev2)
-      from_shell("git log #{rev1}..#{rev2}").strip
+      from_shell("git log --pretty=fuller #{rev1}..#{rev2}").strip
     end
 
     def changed_files(rev1, rev2)
