mirror of
https://github.com/git/git.git
synced 2024-09-28 08:49:45 +02:00
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>
This commit is contained in:
parent
0798d16fe3
commit
019a9d8362
@ -2564,14 +2564,17 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,
|
|||||||
enum todo_command command = opts->action == REPLAY_PICK ?
|
enum todo_command command = opts->action == REPLAY_PICK ?
|
||||||
TODO_PICK : TODO_REVERT;
|
TODO_PICK : TODO_REVERT;
|
||||||
const char *command_string = todo_command_info[command].str;
|
const char *command_string = todo_command_info[command].str;
|
||||||
|
const char *encoding;
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
|
|
||||||
if (prepare_revs(opts))
|
if (prepare_revs(opts))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
encoding = get_log_output_encoding();
|
||||||
|
|
||||||
while ((commit = get_revision(opts->revs))) {
|
while ((commit = get_revision(opts->revs))) {
|
||||||
struct todo_item *item = append_new_todo(todo_list);
|
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;
|
const char *subject;
|
||||||
int subject_len;
|
int subject_len;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user