mirror of
https://github.com/git/git.git
synced 2024-05-05 04:46:12 +02:00
59b519ab7e
In previous changes, mailinfo has learnt to process lines that decoded from base64 or quoted-printable, and ends with CRLF. Let's teach "am" that new trick, too. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
38 lines
840 B
Bash
Executable File
38 lines
840 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test am --quoted-cr=<action>'
|
|
|
|
. ./test-lib.sh
|
|
|
|
DATA="$TEST_DIRECTORY/t4258"
|
|
|
|
test_expect_success 'setup' '
|
|
test_write_lines one two three >text &&
|
|
test_commit one text &&
|
|
test_write_lines one owt three >text &&
|
|
test_commit two text
|
|
'
|
|
|
|
test_expect_success 'am warn if quoted-cr is found' '
|
|
git reset --hard one &&
|
|
test_must_fail git am "$DATA/mbox" 2>err &&
|
|
grep "quoted CRLF detected" err
|
|
'
|
|
|
|
test_expect_success 'am --quoted-cr=strip' '
|
|
test_might_fail git am --abort &&
|
|
git reset --hard one &&
|
|
git am --quoted-cr=strip "$DATA/mbox" &&
|
|
git diff --exit-code HEAD two
|
|
'
|
|
|
|
test_expect_success 'am with config mailinfo.quotecr=strip' '
|
|
test_might_fail git am --abort &&
|
|
git reset --hard one &&
|
|
test_config mailinfo.quotedCr strip &&
|
|
git am "$DATA/mbox" &&
|
|
git diff --exit-code HEAD two
|
|
'
|
|
|
|
test_done
|