Index: tools/hook-scripts/commit-email.pl.in
===================================================================
--- tools/hook-scripts/commit-email.pl.in	(revision 13417)
+++ tools/hook-scripts/commit-email.pl.in	(working copy)
@@ -56,6 +56,8 @@
 # in the log and email messages by not printing the file, then set
 # $no_diff_added to 1.
 my $no_diff_added = 0;
+# Limit body to this many lines (or 0 for no limit)
+my $body_line_limit = 1000;
 
 # End of Configuration section.
 ######################################################################
@@ -373,6 +375,10 @@
 push(@body, @log);
 push(@body, "\n");
 push(@body, map { /[\r\n]+$/ ? $_ : "$_\n" } @difflines);
+if ($body_line_limit > 0 && @body > $body_line_limit)
+  {
+    $#body = $body_line_limit - 1;
+  }
 
 # Go through each project and see if there are any matches for this
 # project.  If so, send the log out.