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

From: Samuel Tardieu <sam@rfc1149.net>
Date: Aug 4, 2008, 15:19 UTC
Message-ID: <20080804151913.4269.74254.stgit@dawn.rfc1149.net>
In-Reply-To: <20080804141640.GB12232@diana.vm.bytemark.co.uk>

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

The long description gets its trailing blanks removed as well as any leading empty lines. Leading blanks are left untouched to preserve the formatting.

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..61e3f3a 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();