squash: Make commit message editing more convenient

[stgit] / stgit / commands / squash.py

diff --git a/stgit/commands/squash.py b/stgit/commands/squash.py
index d0be46674b3f50c2421e85557f33b7b02f7d6e9f..96b8da2dabeb55429c9f5783e13e2549d9c28299 100644 (file)
--- a/stgit/commands/squash.py
+++ b/stgit/commands/squash.py
@@ -68,14 +68,17 @@ def _squash_patches(trans, patches, msg, save_template):
             return None
         cd = cd.set_tree(tree)
     if msg == None:
-        msg = '\n\n'.join('%s\n\n%s' % (pn.ljust(70, '-'),
-                                        trans.patches[pn].data.message)
-                          for pn in patches)
+        msg = utils.append_comment(
+            trans.patches[patches[0]].data.message,
+            '\n\n'.join('%s\n\n%s' % (pn.ljust(70, '-'),
+                                      trans.patches[pn].data.message)
+                        for pn in patches[1:]))
         if save_template:
             save_template(msg)
             raise SaveTemplateDone()
         else:
-            msg = utils.edit_string(msg, '.stgit-squash.txt').strip()
+            msg = utils.edit_string(msg, '.stgit-squash.txt')
+    msg = utils.strip_comment(msg).strip()
     cd = cd.set_message(msg)
 
     return cd