From: Doan Tran Cong Danh Date: Wed, 06 Nov 2019 09:20:05 GMT Subject: [PATCH v3 7/8] sequencer: reencode old merge-commit message Message-ID: <7f0df0f685544ab828a7f6569d5e50a975c423d3.1573031848.git.congdanhqx@gmail.com> In-Reply-To: During rebasing, old merge's message (encoded in old encoding) will be used as message for new merge commit (created by rebase). In case of the value of i18n.commitencoding has been changed after the old merge time. We will receive an usable message for this new merge. Correct it. Signed-off-by: Doan Tran Cong Danh --- sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 833a928929..d735d09f98 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3374,7 +3374,8 @@ static int do_merge(struct repository *r, } if (commit) { - const char *message = get_commit_buffer(commit, NULL); + const char *encoding = get_commit_output_encoding(); + const char *message = logmsg_reencode(commit, NULL, encoding); const char *body; int len; -- 2.24.0.4.g6a51fdd29c