The sequencer_commit() function already knows how to amend commits, and
with this new option, it can also clean up commit messages (i.e. strip
out commented lines). This is needed to implement rebase -i's 'fixup'
and 'squash' commands as sequencer commands.

Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 sequencer.c | 10 +++++++---
 sequencer.h |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 20f7590..5ec956f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -478,7 +478,8 @@ static char **read_author_script(void)
  * (except, of course, while running an interactive rebase).
  */
 int sequencer_commit(const char *defmsg, struct replay_opts *opts,
-                         int allow_empty, int edit, int amend)
+                         int allow_empty, int edit, int amend,
+                         int cleanup_commit_message)
 {
        char **env = NULL;
        struct argv_array array;
@@ -515,9 +516,12 @@ int sequencer_commit(const char *defmsg, struct 
replay_opts *opts,
                argv_array_push(&array, "-s");
        if (defmsg)
                argv_array_pushl(&array, "-F", defmsg, NULL);
+       if (cleanup_commit_message)
+               argv_array_push(&array, "--cleanup=strip");
        if (edit)
                argv_array_push(&array, "-e");
-       else if (!opts->signoff && !opts->record_origin &&
+       else if (!cleanup_commit_message &&
+                !opts->signoff && !opts->record_origin &&
                 git_config_get_value("commit.cleanup", &value))
                argv_array_push(&array, "--cleanup=verbatim");
 
@@ -781,7 +785,7 @@ static int do_pick_commit(enum todo_command command, struct 
commit *commit,
        }
        if (!opts->no_commit)
                res = sequencer_commit(opts->edit ? NULL : git_path_merge_msg(),
-                       opts, allow, opts->edit, 0);
+                       opts, allow, opts->edit, 0, 0);
 
 leave:
        free_message(commit, &msg);
diff --git a/sequencer.h b/sequencer.h
index 2106c0d..e272549 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -50,7 +50,8 @@ int sequencer_rollback(struct replay_opts *opts);
 int sequencer_remove_state(struct replay_opts *opts);
 
 int sequencer_commit(const char *defmsg, struct replay_opts *opts,
-                         int allow_empty, int edit, int amend);
+                         int allow_empty, int edit, int amend,
+                         int cleanup_commit_message);
 
 extern const char sign_off_header[];
 
-- 
2.10.0.rc1.114.g2bd6b38


Reply via email to