Do not mess-up with commit message formatting when sending email

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>
Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index b4d4e18acce6d4ef5ba4b66db60c96404f9822f2..031444d76863ed6f4a728fa31e5f91d51632874d 100644 (file)
--- 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')
         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();
 
     authname = p.get_authname();
     authemail = p.get_authemail();