mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t3901: test git-am encoding conversion
Sinced1c5f2a
(Add git-am, applymbox replacement., 2005-10-07), git-am supported the --utf8 and --no-utf8 options, and if set, would pass the -u flag and the -k flag respectively. git mailinfo -u will re-code the commit log message and authorship info in the charset specified by i18n.commitencoding setting, while git mailinfo -n will disable the re-coding. Sinced84029b
(--utf8 is now default for 'git-am', 2007-01-08), --utf8 is set by default in git-am. Add various encoding conversion tests to t3901 to test git-mailinfo's encoding conversion. In addition, add a test for --no-utf8 to check that no encoding conversion will occur if that option is set. Helped-by: Johannes Sixt <j6t@kdbg.org> Reviewed-by: Stefan Beller <sbeller@google.com> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0f62fbae65
commit
5b05b92d03
|
@ -251,4 +251,66 @@ test_expect_success 'rebase --merge (L/U)' '
|
|||
check_encoding 2 8859
|
||||
'
|
||||
|
||||
test_expect_success 'am (U/U)' '
|
||||
# Apply UTF-8 patches with UTF-8 commitencoding
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git am out-u1 out-u2 &&
|
||||
|
||||
check_encoding 2
|
||||
'
|
||||
|
||||
test_expect_success !MINGW 'am (L/L)' '
|
||||
# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git am out-l1 out-l2 &&
|
||||
|
||||
check_encoding 2 8859
|
||||
'
|
||||
|
||||
test_expect_success 'am (U/L)' '
|
||||
# Apply ISO-8859-1 patches with UTF-8 commitencoding
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
git reset --hard master &&
|
||||
|
||||
# am specifies --utf8 by default.
|
||||
git am out-l1 out-l2 &&
|
||||
|
||||
check_encoding 2
|
||||
'
|
||||
|
||||
test_expect_success 'am --no-utf8 (U/L)' '
|
||||
# Apply ISO-8859-1 patches with UTF-8 commitencoding
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git am --no-utf8 out-l1 out-l2 2>err &&
|
||||
|
||||
# commit-tree will warn that the commit message does not contain valid UTF-8
|
||||
# as mailinfo did not convert it
|
||||
grep "did not conform" err &&
|
||||
|
||||
check_encoding 2
|
||||
'
|
||||
|
||||
test_expect_success !MINGW 'am (L/U)' '
|
||||
# Apply UTF-8 patches with ISO-8859-1 commitencoding
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
# mailinfo will re-code the commit message to the charset specified by
|
||||
# i18n.commitencoding
|
||||
git am out-u1 out-u2 &&
|
||||
|
||||
check_encoding 2 8859
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue