summaryrefslogtreecommitdiff
path: root/t/t3434
diff options
context:
space:
mode:
authorDoan Tran Cong Danh <congdanhqx@gmail.com>2019-11-11 06:03:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-11 09:03:35 (GMT)
commit5772b0c745ea7f57b94880f377e84a79e2675f38 (patch)
treebdbdb79cf27c31d9bc34ba399fdf3d8caee0e4eb /t/t3434
parentb375744274113889c85bee69445375ce51e96648 (diff)
downloadgit-5772b0c745ea7f57b94880f377e84a79e2675f38.zip
git-5772b0c745ea7f57b94880f377e84a79e2675f38.tar.gz
git-5772b0c745ea7f57b94880f377e84a79e2675f38.tar.bz2
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 <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3434')
-rw-r--r--t/t3434/eucJP.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3434/eucJP.txt b/t/t3434/eucJP.txt
new file mode 100644
index 0000000..546f2aa
--- /dev/null
+++ b/t/t3434/eucJP.txt
@@ -0,0 +1,4 @@
+はれひほふ
+
+しているのが、いるので。
+濱浜ほれぷりぽれまびぐりろへ。