[StGIT PATCH] Do not mess-up with commit message formatting when sending email

From: Samuel Tardieu <sam@rfc1149.net>
Date: Jul 31, 2008, 12:50 UTC
Message-ID: <20080731125005.894.10592.stgit@dawn.rfc1149.net>

The short description, which will be used as the email subject, gets its leading and trailing whitespaces removed.

The long description only gets its trailing whitespaces removed to preserve commit message formatting, e.g. in the case of a ChangeLog-style commit message, as well as empty leading lines.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
---
 stgit/commands/mail.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index a833efc..bdc3fcc 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -401,8 +401,8 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options):
         options.edit_patches = True
 
     descr_lines = descr.split('\n')
-    short_descr = descr_lines[0].rstrip()
-    long_descr = '\n'.join(descr_lines[1:]).lstrip()
+    short_descr = descr_lines[0].strip()
+    long_descr = '\n'.join([l.rstrip() for l in descr_lines[1:]]).lstrip('\n')
 
     authname = p.get_authname();
     authemail = p.get_authemail();