@matheusbsbs / matheus-bagliano / commits / 019a9d8362
Fork 0

sequencer: reencode revert/cherry-pick's todo list

Keep revert/cherry-pick's todo list in line with rebase todo list. Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Doan Tran Cong Danh committed Nov 8, 2019 at 16:43 UTC 019a9d836230c8851aa8b0d4dc2e0dea42662a90
1 file changed +4 -1
sequencer.c
+4 -1
@@ -2564,14 +2564,17 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,
2564 enum todo_command command = opts->action == REPLAY_PICK ?
2565 TODO_PICK : TODO_REVERT;
2566 const char *command_string = todo_command_info[command].str;
2567 + const char *encoding;
2568 struct commit *commit;
2569
2570 if (prepare_revs(opts))
2571 return -1;
2572
2573 + encoding = get_log_output_encoding();
2574 +
2575 while ((commit = get_revision(opts->revs))) {
2576 struct todo_item *item = append_new_todo(todo_list);
2574 - const char *commit_buffer = get_commit_buffer(commit, NULL);
2577 + const char *commit_buffer = logmsg_reencode(commit, NULL, encoding);
2578 const char *subject;
2579 int subject_len;
2580