summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorDoan Tran Cong Danh <congdanhqx@gmail.com>2019-11-08 09:43:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-11 00:43:48 (GMT)
commit019a9d836230c8851aa8b0d4dc2e0dea42662a90 (patch)
treea93714af1a15dc4abe485d4471c1bdf592c62d30 /sequencer.c
parent0798d16fe38e45453b626c699d92de6f9d71f5ac (diff)
downloadgit-019a9d836230c8851aa8b0d4dc2e0dea42662a90.zip
git-019a9d836230c8851aa8b0d4dc2e0dea42662a90.tar.gz
git-019a9d836230c8851aa8b0d4dc2e0dea42662a90.tar.bz2
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>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 69430fe..a19954f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -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;