]> git.ipfire.org Git - thirdparty/git.git/commitdiff
sequencer: reencode revert/cherry-pick's todo list
authorDoan Tran Cong Danh <congdanhqx@gmail.com>
Fri, 8 Nov 2019 09:43:47 +0000 (16:43 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Nov 2019 00:43:48 +0000 (09:43 +0900)
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>
sequencer.c

index 69430fe23f36bfa67ada774f4802f25d8d60ca71..a19954f2bfefbb6df70f28eefcb68a921dddba34 100644 (file)
@@ -2564,14 +2564,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;