Add an empty line before signed-off-by

Default to the standard convention of having an empty line
before the Signed-off line when addign a signature using the
--sign option.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/stack.py b/stgit/stack.py
index feb77e343341d3da9c03a60c60cd10e1c07ef608..9dd5ec72a2411e585dfe957b3dacdde29409ce97 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -734,7 +734,12 @@ class Series(StgitObject):
             committer_email = patch.get_commemail()
 
         if sign_str:
             committer_email = patch.get_commemail()
 
         if sign_str:

-            descr = '%s\n%s: %s <%s>\n' % (descr.rstrip(), sign_str,
+            descr = descr.rstrip()
+            if descr.find("\nSigned-off-by:") < 0 \
+               and descr.find("\nAcked-by:") < 0:
+                descr = descr + "\n"
+
+            descr = '%s\n%s: %s <%s>\n' % (descr, sign_str,

                                            committer_name, committer_email)
 
         bottom = patch.get_bottom()
                                            committer_name, committer_email)
 
         bottom = patch.get_bottom()