Enhancement: cleanup commit message

GitSavvy.sublime-settings

@@ -308,12 +308,20 @@
     */
     "rebase_preserve_merges": false,
 
+
+
     /*
         When set to `true`, GitSavvy will prompt for confirmation before actually
         performing a `git push --force` operation.
      */
     "confirm_force_push": true,
 
+    /*
+        This setting controls how commit messages are cleaned up in the commit view:
+        `git commit --cleanup=<mode>`. It is ignored if `git config commit.cleanup` is set.
+    */
+    "commit_cleanup_default_mode": "strip",
+
     /*
         When set to `true`, closing the commit message window via keyboard will result
         in a commit action being taken, except in cases where the message is empty.

core/commands/commit.py

@@ -155,7 +155,7 @@ def run(self, edit):
 
         if has_prepare_commit_msg_hook and os.path.exists(commit_editmsg_path):
             with util.file.safe_open(commit_editmsg_path, "r") as f:
-                initial_text = "\n" + f.read().rstrip() + help_text
+                initial_text = f.read().rstrip() + help_text
         elif option_amend:
             last_commit_message = self.git("log", "-1", "--pretty=%B").strip()
             initial_text = last_commit_message + help_text
@@ -317,6 +317,10 @@ def run_async(self, commit_message=None):
             help_text = view_settings.get("git_savvy.commit_view.help_text")
             commit_message = view_text.split(help_text)[0]
 
+        cleanup_mode = self.git("config", "commit.cleanup", throw_on_stderr=False).strip()
+        if not cleanup_mode:
+            cleanup_mode = self.savvy_settings.get("commit_cleanup_default_mode", "strip")
+
         include_unstaged = view_settings.get("git_savvy.commit_view.include_unstaged")
 
         show_panel_overrides = self.savvy_settings.get("show_panel_for")
@@ -332,6 +336,7 @@ def run_async(self, commit_message=None):
                 "--amend" if view_settings.get("git_savvy.commit_view.amend") else None,
                 "-F",
                 "-",
+                "--cleanup={}".format(cleanup_mode),
                 stdin=commit_message
             )
         finally: