git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b375744)
sequencer: reencode old merge-commit message
authorDoan Tran Cong Danh <redacted>
Mon, 11 Nov 2019 06:03:40 +0000 (13:03 +0700)
committerJunio C Hamano <redacted>
Mon, 11 Nov 2019 09:03:35 +0000 (18:03 +0900)
commit5772b0c745ea7f57b94880f377e84a79e2675f38
treebdbdb79cf27c31d9bc34ba399fdf3d8caee0e4ebtree | snapshot
parentb375744274113889c85bee69445375ce51e96648commit | diff
sequencer: reencode old merge-commit message

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 unusable message for this new merge.

Correct it.

This change also notice a breakage with git-rebase label system.

Signed-off-by: Doan Tran Cong Danh <redacted>
Signed-off-by: Junio C Hamano <redacted>
sequencer.c diff | blob | history
t/t3434-rebase-i18n.sh [new file with mode: 0755] blob
t/t3434/eucJP.txt [new file with mode: 0644] blob
git clone https://git.99rst.org/PROJECT