[PATCH v6 5/9] sequencer: reencode revert/cherry-pick's todo list
From: Doan Tran Cong Danh <hidden>
Date: 2019-11-11 06:04:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Keep revert/cherry-pick's todo list in line with rebase todo list. Signed-off-by: Doan Tran Cong Danh <redacted> --- sequencer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 05403a9005..6ab1bba39d 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -2562,14 +2562,17 @@ static int walk_revs_populate_todo(struct todo_list *todo_list, enum todo_command command = opts->action == REPLAY_PICK ? TODO_PICK : TODO_REVERT; const char *command_string = todo_command_info[command].str; + const char *encoding; struct commit *commit; if (prepare_revs(opts)) return -1; + encoding = get_log_output_encoding(); + while ((commit = get_revision(opts->revs))) { struct todo_item *item = append_new_todo(todo_list); - const char *commit_buffer = get_commit_buffer(commit, NULL); + const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); const char *subject; int subject_len;
--
2.24.0.164.g78daf050de.dirty