git@vger.kernel.org mailing list mirror (one of many)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
 #!/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 CR detected" err
'

test_expect_success 'am strip if quoted-cr is found' '
	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 strip if quoted-cr is found' '
	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