git/t/t3434, branch next Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=next 2019-11-11T09:03:35Z sequencer: reencode commit message for am/rebase --show-current-patch 2019-11-11T09:03:35Z Doan Tran Cong Danh congdanhqx@gmail.com 2019-11-11T06:03:41Z urn:sha1:52f52e5ae4937de2bc798828c47c49f469b2cc85 The message file will be used as commit message for the git-{am,rebase} --continue. Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> sequencer: reencode old merge-commit message 2019-11-11T09:03:35Z Doan Tran Cong Danh congdanhqx@gmail.com 2019-11-11T06:03:40Z urn:sha1:5772b0c745ea7f57b94880f377e84a79e2675f38 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 <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>