sequencer: allow editing the commit message on a case-by-case basis

In the upcoming commits, we will implement more and more of rebase
-i's functionality. One particular feature of the commands to come is
that some of them allow editing the commit message while others don't,
i.e. we cannot define in the replay_opts whether the commit message
should be edited or not.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

sequencer.c

@@ -468,7 +468,7 @@ static char **read_author_script()
  * (except, of course, while running an interactive rebase).
  */
 int sequencer_commit(const char *defmsg, struct replay_opts *opts,
-			  int allow_empty)
+			  int allow_empty, int edit)
 {
 	char **env = NULL;
 	struct argv_array array;
@@ -502,15 +502,15 @@ int sequencer_commit(const char *defmsg, struct replay_opts *opts,
 		argv_array_pushf(&array, "-S%s", opts->gpg_sign);
 	if (opts->signoff)
 		argv_array_push(&array, "-s");
-	if (!opts->edit || IS_REBASE_I()) {
+	if (!edit || IS_REBASE_I()) {
 		argv_array_push(&array, "-F");
 		argv_array_push(&array, defmsg);
 		if (!opts->signoff &&
 		    !opts->record_origin &&
 		    git_config_get_value("commit.cleanup", &value))
 			argv_array_push(&array, "--cleanup=verbatim");
 	}
-	if (opts->edit && IS_REBASE_I())
+	if (edit && IS_REBASE_I())
 		argv_array_push(&array, "-e");
 
 	if (allow_empty)
@@ -777,7 +777,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
 		goto leave;
 	}
 	if (!opts->no_commit)
-		res = sequencer_commit(git_path_merge_msg(), opts, allow);
+		res = sequencer_commit(git_path_merge_msg(), opts, allow,
+			opts->edit);
 
 leave:
 	free_message(commit, &msg);

sequencer.h

@@ -45,7 +45,7 @@ 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 allow_empty, int edit);
 
 extern const char sign_off_header[];