Skip to content

Commit

Permalink
sequencer: reencode revert/cherry-pick's todo list
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
sgn authored and gitster committed Nov 11, 2019
1 parent 0798d16 commit 019a9d8
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 019a9d8

Please sign in to comment.