-
Notifications
You must be signed in to change notification settings - Fork 25.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Showing
3 changed files
with
63 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
#!/bin/sh | ||
# | ||
# Copyright (c) 2019 Doan Tran Cong Danh | ||
# | ||
|
||
test_description='rebase with changing encoding | ||
Initial setup: | ||
1 - 2 master | ||
\ | ||
3 - 4 first | ||
\ | ||
5 - 6 second | ||
' | ||
|
||
. ./test-lib.sh | ||
|
||
compare_msg () { | ||
iconv -f "$2" -t "$3" "$TEST_DIRECTORY/t3434/$1" >expect && | ||
git cat-file commit HEAD >raw && | ||
sed "1,/^$/d" raw >actual && | ||
test_cmp expect actual | ||
} | ||
|
||
test_expect_success setup ' | ||
test_commit one && | ||
git branch first && | ||
test_commit two && | ||
git switch first && | ||
test_commit three && | ||
git branch second && | ||
test_commit four && | ||
git switch second && | ||
test_commit five && | ||
test_commit six | ||
' | ||
|
||
test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' ' | ||
git switch -c merge-eucJP-UTF-8 first && | ||
git config i18n.commitencoding eucJP && | ||
git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && | ||
git config i18n.commitencoding UTF-8 && | ||
git rebase --rebase-merges master && | ||
compare_msg eucJP.txt eucJP UTF-8 | ||
' | ||
|
||
test_expect_failure 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' ' | ||
git switch -c merge-eucJP-ISO-2022-JP first && | ||
git config i18n.commitencoding eucJP && | ||
git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && | ||
git config i18n.commitencoding ISO-2022-JP && | ||
git rebase --rebase-merges master && | ||
compare_msg eucJP.txt eucJP ISO-2022-JP | ||
' | ||
|
||
test_done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
�Ϥ�Ҥۤ� | ||
|
||
���Ƥ���Τ�������Τǡ� | ||
���ͤۤ�פ�ݤ�ޤӤ�����ء� |