[thirdparty/git.git] / t / t4124-apply-ws-rule.sh

#!/bin/sh

test_description='core.whitespace rules and git apply'

. ./test-lib.sh

prepare_test_file () {

	# A line that has character X is touched iff RULE is in effect:
	#       X  RULE
	#   	!  trailing-space
	#   	@  space-before-tab
	#   	#  indent-with-non-tab (default tab width 8)
	#	=  indent-with-non-tab,tabwidth=16
	#   	%  tab-in-indent
	sed -e "s/_/ /g" -e "s/>/	/" <<-\EOF
		An_SP in an ordinary line>and a HT.
		>A HT (%).
		_>A SP and a HT (@%).
		_>_A SP, a HT and a SP (@%).
		_______Seven SP.
		________Eight SP (#).
		_______>Seven SP and a HT (@%).
		________>Eight SP and a HT (@#%).
		_______>_Seven SP, a HT and a SP (@%).
		________>_Eight SP, a HT and a SP (@#%).
		_______________Fifteen SP (#).
		_______________>Fifteen SP and a HT (@#%).
		________________Sixteen SP (#=).
		________________>Sixteen SP and a HT (@#%=).
		_____a__Five SP, a non WS, two SP.
		A line with a (!) trailing SP_
		A line with a (!) trailing HT>
	EOF
}

apply_patch () {
	cmd_prefix= &&
	if test "x$1" = 'x!'
	then
		cmd_prefix=test_must_fail &&
		shift
	fi &&
	>target &&
	sed -e "s|\([ab]\)/file|\1/target|" <patch |
	$cmd_prefix git apply "$@"
}

test_fix () {
	# fix should not barf
	apply_patch --whitespace=fix || return 1

	# find touched lines
	$DIFF file target | sed -n -e "s/^> //p" >fixed

	# the changed lines are all expected to change
	fixed_cnt=$(wc -l <fixed)
	case "$1" in
	'') expect_cnt=$fixed_cnt ;;
	?*) expect_cnt=$(grep "[$1]" <fixed | wc -l) ;;
	esac
	test $fixed_cnt -eq $expect_cnt || return 1

	# and we are not missing anything
	case "$1" in
	'') expect_cnt=0 ;;
	?*) expect_cnt=$(grep "[$1]" <file | wc -l) ;;
	esac
	test $fixed_cnt -eq $expect_cnt || return 1

	# Get the patch actually applied
	git diff-files -p target >fixed-patch
	test -s fixed-patch && return 0

	# Make sure it is complaint-free
	>target
	git apply --whitespace=error-all <fixed-patch

}

test_expect_success setup '

	>file &&
	git add file &&
	prepare_test_file >file &&
	git diff-files -p >patch &&
	>target &&
	git add target

'

test_expect_success 'whitespace=nowarn, default rule' '

	apply_patch --whitespace=nowarn &&
	test_cmp file target

'

test_expect_success 'whitespace=warn, default rule' '

	apply_patch --whitespace=warn &&
	test_cmp file target

'

test_expect_success 'whitespace=error-all, default rule' '

	apply_patch ! --whitespace=error-all &&
	test_must_be_empty target

'

test_expect_success 'whitespace=error-all, no rule' '

	git config core.whitespace -trailing,-space-before,-indent &&
	apply_patch --whitespace=error-all &&
	test_cmp file target

'

test_expect_success 'whitespace=error-all, no rule (attribute)' '

	git config --unset core.whitespace &&
	echo "target -whitespace" >.gitattributes &&
	apply_patch --whitespace=error-all &&
	test_cmp file target

'

test_expect_success 'spaces inserted by tab-in-indent' '

	git config core.whitespace -trailing,-space,-indent,tab &&
	rm -f .gitattributes &&
	test_fix % &&
	sed -e "s/_/ /g" -e "s/>/	/" <<-\EOF >expect &&
		An_SP in an ordinary line>and a HT.
		________A HT (%).
		________A SP and a HT (@%).
		_________A SP, a HT and a SP (@%).
		_______Seven SP.
		________Eight SP (#).
		________Seven SP and a HT (@%).
		________________Eight SP and a HT (@#%).
		_________Seven SP, a HT and a SP (@%).
		_________________Eight SP, a HT and a SP (@#%).
		_______________Fifteen SP (#).
		________________Fifteen SP and a HT (@#%).
		________________Sixteen SP (#=).
		________________________Sixteen SP and a HT (@#%=).
		_____a__Five SP, a non WS, two SP.
		A line with a (!) trailing SP_
		A line with a (!) trailing HT>
	EOF
	test_cmp expect target

'

for t in - ''
do
	case "$t" in '') tt='!' ;; *) tt= ;; esac
	for s in - ''
	do
		case "$s" in '') ts='@' ;; *) ts= ;; esac
		for i in - ''
		do
			case "$i" in '') ti='#' ti16='=';; *) ti= ti16= ;; esac
			for h in - ''
			do
				[ -z "$h$i" ] && continue
				case "$h" in '') th='%' ;; *) th= ;; esac
				rule=${t}trailing,${s}space,${i}indent,${h}tab

				rm -f .gitattributes
				test_expect_success "rule=$rule" '
					git config core.whitespace "$rule" &&
					test_fix "$tt$ts$ti$th"
				'

				test_expect_success "rule=$rule,tabwidth=16" '
					git config core.whitespace "$rule,tabwidth=16" &&
					test_fix "$tt$ts$ti16$th"
				'

				test_expect_success "rule=$rule (attributes)" '
					git config --unset core.whitespace &&
					echo "target whitespace=$rule" >.gitattributes &&
					test_fix "$tt$ts$ti$th"
				'

				test_expect_success "rule=$rule,tabwidth=16 (attributes)" '
					echo "target whitespace=$rule,tabwidth=16" >.gitattributes &&
					test_fix "$tt$ts$ti16$th"
				'

			done
		done
	done
done

create_patch () {
	sed -e "s/_/ /" <<-\EOF
		diff --git a/target b/target
		index e69de29..8bd6648 100644
		--- a/target
		+++ b/target
		@@ -0,0 +1,3 @@
		+An empty line follows
		+
		+A line with trailing whitespace and no newline_
		\ No newline at end of file
	EOF
}

test_expect_success 'trailing whitespace & no newline at the end of file' '
	>target &&
	create_patch >patch-file &&
	git apply --whitespace=fix patch-file &&
	grep "newline$" target &&
	grep "^$" target
'

test_expect_success 'blank at EOF with --whitespace=fix (1)' '
	test_might_fail git config --unset core.whitespace &&
	rm -f .gitattributes &&

	{ echo a; echo b; echo c; } >one &&
	git add one &&
	{ echo a; echo b; echo c; } >expect &&
	{ cat expect; echo; } >one &&
	git diff -- one >patch &&

	git checkout one &&
	git apply --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'blank at EOF with --whitespace=fix (2)' '
	{ echo a; echo b; echo c; } >one &&
	git add one &&
	{ echo a; echo c; } >expect &&
	{ cat expect; echo; echo; } >one &&
	git diff -- one >patch &&

	git checkout one &&
	git apply --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'blank at EOF with --whitespace=fix (3)' '
	{ echo a; echo b; echo; } >one &&
	git add one &&
	{ echo a; echo c; echo; } >expect &&
	{ cat expect; echo; echo; } >one &&
	git diff -- one >patch &&

	git checkout one &&
	git apply --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'blank at end of hunk, not at EOF with --whitespace=fix' '
	{ echo a; echo b; echo; echo; echo; echo; echo; echo d; } >one &&
	git add one &&
	{ echo a; echo c; echo; echo; echo; echo; echo; echo; echo d; } >expect &&
	cp expect one &&
	git diff -- one >patch &&

	git checkout one &&
	git apply --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'blank at EOF with --whitespace=warn' '
	{ echo a; echo b; echo c; } >one &&
	git add one &&
	echo >>one &&
	cat one >expect &&
	git diff -- one >patch &&

	git checkout one &&
	git apply --whitespace=warn patch 2>error &&
	test_cmp expect one &&
	grep "new blank line at EOF" error
'

test_expect_success 'blank at EOF with --whitespace=error' '
	{ echo a; echo b; echo c; } >one &&
	git add one &&
	cat one >expect &&
	echo >>one &&
	git diff -- one >patch &&

	git checkout one &&
	test_must_fail git apply --whitespace=error patch 2>error &&
	test_cmp expect one &&
	grep "new blank line at EOF" error
'

test_expect_success 'blank but not empty at EOF' '
	{ echo a; echo b; echo c; } >one &&
	git add one &&
	echo "   " >>one &&
	cat one >expect &&
	git diff -- one >patch &&

	git checkout one &&
	git apply --whitespace=warn patch 2>error &&
	test_cmp expect one &&
	grep "new blank line at EOF" error
'

test_expect_success 'applying beyond EOF requires one non-blank context line' '
	{ echo; echo; echo; echo; } >one &&
	git add one &&
	{ echo b; } >>one &&
	git diff -- one >patch &&

	git checkout one &&
	{ echo a; echo; } >one &&
	cp one expect &&
	test_must_fail git apply --whitespace=fix patch &&
	test_cmp expect one &&
	test_must_fail git apply --ignore-space-change --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'tons of blanks at EOF should not apply' '
	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
		echo; echo; echo; echo;
	done >one &&
	git add one &&
	echo a >>one &&
	git diff -- one >patch &&

	>one &&
	test_must_fail git apply --whitespace=fix patch &&
	test_must_fail git apply --ignore-space-change --whitespace=fix patch
'

test_expect_success 'missing blank line at end with --whitespace=fix' '
	echo a >one &&
	echo >>one &&
	git add one &&
	echo b >>one &&
	cp one expect &&
	git diff -- one >patch &&
	echo a >one &&
	cp one saved-one &&
	test_must_fail git apply patch &&
	git apply --whitespace=fix patch &&
	test_cmp expect one &&
	mv saved-one one &&
	git apply --ignore-space-change --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'two missing blank lines at end with --whitespace=fix' '
	{ echo a; echo; echo b; echo c; } >one &&
	cp one no-blank-lines &&
	{ echo; echo; } >>one &&
	git add one &&
	echo d >>one &&
	cp one expect &&
	echo >>one &&
	git diff -- one >patch &&
	cp no-blank-lines one &&
	test_must_fail git apply patch &&
	git apply --whitespace=fix patch &&
	test_cmp expect one &&
	mv no-blank-lines one &&
	test_must_fail git apply patch &&
	git apply --ignore-space-change --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'missing blank line at end, insert before end, --whitespace=fix' '
	{ echo a; echo; } >one &&
	git add one &&
	{ echo b; echo a; echo; } >one &&
	cp one expect &&
	git diff -- one >patch &&
	echo a >one &&
	test_must_fail git apply patch &&
	git apply --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'shrink file with tons of missing blanks at end of file' '
	{ echo a; echo b; echo c; } >one &&
	cp one no-blank-lines &&
	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
		echo; echo; echo; echo;
	done >>one &&
	git add one &&
	echo a >one &&
	cp one expect &&
	git diff -- one >patch &&
	cp no-blank-lines one &&
	test_must_fail git apply patch &&
	git apply --whitespace=fix patch &&
	test_cmp expect one &&
	mv no-blank-lines one &&
	git apply --ignore-space-change --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'missing blanks at EOF must only match blank lines' '
	{ echo a; echo b; } >one &&
	git add one &&
	{ echo c; echo d; } >>one &&
	git diff -- one >patch &&

	echo a >one &&
	test_must_fail git apply patch &&
	test_must_fail git apply --whitespace=fix patch &&
	test_must_fail git apply --ignore-space-change --whitespace=fix patch
'

sed -e's/Z//' >one <<EOF
a
b
c
		      Z
EOF

test_expect_success 'missing blank line should match context line with spaces' '
	git add one &&
	echo d >>one &&
	git diff -- one >patch &&
	{ echo a; echo b; echo c; } >one &&
	cp one expect &&
	{ echo; echo d; } >>expect &&
	git add one &&

	git apply --whitespace=fix patch &&
	test_cmp expect one
'

sed -e's/Z//' >one <<EOF
a
b
c
		      Z
EOF

test_expect_success 'same, but with the --ignore-space-option' '
	git add one &&
	echo d >>one &&
	cp one expect &&
	git diff -- one >patch &&
	{ echo a; echo b; echo c; } >one &&
	git add one &&

	git checkout-index -f one &&
	git apply --ignore-space-change --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'same, but with CR-LF line endings && cr-at-eol set' '
	git config core.whitespace cr-at-eol &&
	printf "a\r\n" >one &&
	printf "b\r\n" >>one &&
	printf "c\r\n" >>one &&
	cp one save-one &&
	printf "                 \r\n" >>one &&
	git add one &&
	printf "d\r\n" >>one &&
	cp one expect &&
	git diff -- one >patch &&
	mv save-one one &&

	git apply --ignore-space-change --whitespace=fix patch &&
	test_cmp expect one
'

test_expect_success 'CR-LF line endings && add line && text=auto' '
	git config --unset core.whitespace &&
	printf "a\r\n" >one &&
	cp one save-one &&
	git add one &&
	printf "b\r\n" >>one &&
	cp one expect &&
	git diff -- one >patch &&
	mv save-one one &&
	echo "one text=auto" >.gitattributes &&
	git apply patch &&
	test_cmp expect one
'

test_expect_success 'CR-LF line endings && change line && text=auto' '
	printf "a\r\n" >one &&
	cp one save-one &&
	git add one &&
	printf "b\r\n" >one &&
	cp one expect &&
	git diff -- one >patch &&
	mv save-one one &&
	echo "one text=auto" >.gitattributes &&
	git apply patch &&
	test_cmp expect one
'

test_expect_success 'LF in repo, CRLF in worktree && change line && text=auto' '
	printf "a\n" >one &&
	git add one &&
	printf "b\r\n" >one &&
	git diff -- one >patch &&
	printf "a\r\n" >one &&
	echo "one text=auto" >.gitattributes &&
	git -c core.eol=CRLF apply patch &&
	printf "b\r\n" >expect &&
	test_cmp expect one
'

test_expect_success 'whitespace=fix to expand' '
	qz_to_tab_space >preimage <<-\EOF &&
	QQa
	QQb
	QQc
	ZZZZZZZZZZZZZZZZd
	QQe
	QQf
	QQg
	EOF
	qz_to_tab_space >patch <<-\EOF &&
	diff --git a/preimage b/preimage
	--- a/preimage
	+++ b/preimage
	@@ -1,7 +1,6 @@
	 QQa
	 QQb
	 QQc
	-QQd
	 QQe
	 QQf
	 QQg
	EOF
	git -c core.whitespace=tab-in-indent apply --whitespace=fix patch
'

test_expect_success 'whitespace check skipped for excluded paths' '
	git config core.whitespace blank-at-eol &&
	>used &&
	>unused &&
	git add used unused &&
	echo "used" >used &&
	echo "unused " >unused &&
	git diff-files -p used unused >patch &&
	git apply --include=used --stat --whitespace=error <patch
'

test_done
Commit	Line	Data
d5a41641 JH	1	#!/bin/sh
d5a41641 JH	2
3604e7c5	3	test_description='core.whitespace rules and git apply'
d5a41641 JH	4
	5	. ./test-lib.sh
	6
	7	prepare_test_file () {
	8
	9	# A line that has character X is touched iff RULE is in effect:
	10	# X RULE
	11	# ! trailing-space
	12	# @ space-before-tab
f4b05a49 JS	13	# # indent-with-non-tab (default tab width 8)
f4b05a49 JS	14	# = indent-with-non-tab,tabwidth=16
a347b17f	15	# % tab-in-indent
d5a41641 JH	16	sed -e "s/_/ /g" -e "s/>/ /" <<-\EOF
d5a41641 JH	17	An_SP in an ordinary line>and a HT.
a347b17f CW	18	>A HT (%).
	19	_>A SP and a HT (@%).
	20	_>_A SP, a HT and a SP (@%).
d5a41641 JH	21	_______Seven SP.
d5a41641 JH	22	________Eight SP (#).
a347b17f CW	23	_______>Seven SP and a HT (@%).
	24	________>Eight SP and a HT (@#%).
	25	_______>_Seven SP, a HT and a SP (@%).
	26	________>_Eight SP, a HT and a SP (@#%).
d5a41641	27	_______________Fifteen SP (#).
a347b17f	28	_______________>Fifteen SP and a HT (@#%).
f4b05a49 JS	29	________________Sixteen SP (#=).
f4b05a49 JS	30	________________>Sixteen SP and a HT (@#%=).
d5a41641 JH	31	_____a__Five SP, a non WS, two SP.
	32	A line with a (!) trailing SP_
	33	A line with a (!) trailing HT>
	34	EOF
	35	}
	36
	37	apply_patch () {
37a63faa DL	38	cmd_prefix= &&
	39	if test "x$1" = 'x!'
	40	then
	41	cmd_prefix=test_must_fail &&
	42	shift
	43	fi &&
d5a41641 JH	44	>target &&
d5a41641 JH	45	sed -e "s\|\([ab]\)/file\|\1/target\|" <patch \|
37a63faa	46	$cmd_prefix git apply "$@"
d5a41641 JH	47	}
	48
	49	test_fix () {
d5a41641 JH	50	# fix should not barf
	51	apply_patch --whitespace=fix \|\| return 1
	52
	53	# find touched lines
4fdf71be	54	$DIFF file target \| sed -n -e "s/^> //p" >fixed
d5a41641	55
41ccfdd9	56	# the changed lines are all expected to change
d5a41641 JH	57	fixed_cnt=$(wc -l <fixed)
	58	case "$1" in
	59	'') expect_cnt=$fixed_cnt ;;
	60	?*) expect_cnt=$(grep "[$1]" <fixed \| wc -l) ;;
	61	esac
	62	test $fixed_cnt -eq $expect_cnt \|\| return 1
	63
	64	# and we are not missing anything
	65	case "$1" in
	66	'') expect_cnt=0 ;;
	67	?*) expect_cnt=$(grep "[$1]" <file \| wc -l) ;;
	68	esac
	69	test $fixed_cnt -eq $expect_cnt \|\| return 1
	70
	71	# Get the patch actually applied
	72	git diff-files -p target >fixed-patch
	73	test -s fixed-patch && return 0
	74
	75	# Make sure it is complaint-free
	76	>target
	77	git apply --whitespace=error-all <fixed-patch
	78
	79	}
	80
	81	test_expect_success setup '
	82
	83	>file &&
	84	git add file &&
	85	prepare_test_file >file &&
	86	git diff-files -p >patch &&
	87	>target &&
	88	git add target
	89
	90	'
	91
	92	test_expect_success 'whitespace=nowarn, default rule' '
	93
	94	apply_patch --whitespace=nowarn &&
4fdf71be	95	test_cmp file target
d5a41641 JH	96
	97	'
	98
	99	test_expect_success 'whitespace=warn, default rule' '
	100
	101	apply_patch --whitespace=warn &&
4fdf71be	102	test_cmp file target
d5a41641 JH	103
	104	'
	105
	106	test_expect_success 'whitespace=error-all, default rule' '
	107
37a63faa	108	apply_patch ! --whitespace=error-all &&
ec10b018	109	test_must_be_empty target
d5a41641 JH	110
	111	'
	112
	113	test_expect_success 'whitespace=error-all, no rule' '
	114
	115	git config core.whitespace -trailing,-space-before,-indent &&
	116	apply_patch --whitespace=error-all &&
4fdf71be	117	test_cmp file target
d5a41641 JH	118
	119	'
	120
cf1b7869 JH	121	test_expect_success 'whitespace=error-all, no rule (attribute)' '
	122
	123	git config --unset core.whitespace &&
	124	echo "target -whitespace" >.gitattributes &&
	125	apply_patch --whitespace=error-all &&
4fdf71be	126	test_cmp file target
cf1b7869 JH	127
	128	'
	129
d35711ad JS	130	test_expect_success 'spaces inserted by tab-in-indent' '
	131
	132	git config core.whitespace -trailing,-space,-indent,tab &&
	133	rm -f .gitattributes &&
	134	test_fix % &&
	135	sed -e "s/_/ /g" -e "s/>/ /" <<-\EOF >expect &&
	136	An_SP in an ordinary line>and a HT.
	137	________A HT (%).
	138	________A SP and a HT (@%).
	139	_________A SP, a HT and a SP (@%).
	140	_______Seven SP.
	141	________Eight SP (#).
	142	________Seven SP and a HT (@%).
	143	________________Eight SP and a HT (@#%).
	144	_________Seven SP, a HT and a SP (@%).
	145	_________________Eight SP, a HT and a SP (@#%).
	146	_______________Fifteen SP (#).
	147	________________Fifteen SP and a HT (@#%).
f4b05a49 JS	148	________________Sixteen SP (#=).
f4b05a49 JS	149	________________________Sixteen SP and a HT (@#%=).
d35711ad JS	150	_____a__Five SP, a non WS, two SP.
	151	A line with a (!) trailing SP_
	152	A line with a (!) trailing HT>
	153	EOF
	154	test_cmp expect target
	155
	156	'
	157
d5a41641 JH	158	for t in - ''
	159	do
	160	case "$t" in '') tt='!' ;; *) tt= ;; esac
	161	for s in - ''
	162	do
	163	case "$s" in '') ts='@' ;; *) ts= ;; esac
	164	for i in - ''
	165	do
f4b05a49	166	case "$i" in '') ti='#' ti16='=';; *) ti= ti16= ;; esac
a347b17f CW	167	for h in - ''
	168	do
	169	[ -z "$h$i" ] && continue
	170	case "$h" in '') th='%' ;; *) th= ;; esac
	171	rule=${t}trailing,${s}space,${i}indent,${h}tab
	172
	173	rm -f .gitattributes
	174	test_expect_success "rule=$rule" '
	175	git config core.whitespace "$rule" &&
	176	test_fix "$tt$ts$ti$th"
	177	'
	178
f4b05a49 JS	179	test_expect_success "rule=$rule,tabwidth=16" '
	180	git config core.whitespace "$rule,tabwidth=16" &&
	181	test_fix "$tt$ts$ti16$th"
	182	'
	183
a347b17f CW	184	test_expect_success "rule=$rule (attributes)" '
	185	git config --unset core.whitespace &&
	186	echo "target whitespace=$rule" >.gitattributes &&
	187	test_fix "$tt$ts$ti$th"
	188	'
	189
f4b05a49 JS	190	test_expect_success "rule=$rule,tabwidth=16 (attributes)" '
	191	echo "target whitespace=$rule,tabwidth=16" >.gitattributes &&
	192	test_fix "$tt$ts$ti16$th"
	193	'
	194
a347b17f	195	done
d5a41641 JH	196	done
	197	done
	198	done
	199
735c6744 SG	200	create_patch () {
	201	sed -e "s/_/ /" <<-\EOF
	202	diff --git a/target b/target
	203	index e69de29..8bd6648 100644
	204	--- a/target
	205	+++ b/target
422a82f2 JH	206	@@ -0,0 +1,3 @@
	207	+An empty line follows
	208	+
735c6744 SG	209	+A line with trailing whitespace and no newline_
	210	\ No newline at end of file
	211	EOF
	212	}
	213
	214	test_expect_success 'trailing whitespace & no newline at the end of file' '
	215	>target &&
422a82f2 JH	216	create_patch >patch-file &&
	217	git apply --whitespace=fix patch-file &&
	218	grep "newline$" target &&
	219	grep "^$" target
735c6744 SG	220	'
735c6744 SG	221
ef2035c5	222	test_expect_success 'blank at EOF with --whitespace=fix (1)' '
33fc5211 JN	223	test_might_fail git config --unset core.whitespace &&
33fc5211 JN	224	rm -f .gitattributes &&
ef2035c5 JH	225
	226	{ echo a; echo b; echo c; } >one &&
	227	git add one &&
	228	{ echo a; echo b; echo c; } >expect &&
	229	{ cat expect; echo; } >one &&
	230	git diff -- one >patch &&
	231
	232	git checkout one &&
	233	git apply --whitespace=fix patch &&
	234	test_cmp expect one
	235	'
	236
	237	test_expect_success 'blank at EOF with --whitespace=fix (2)' '
	238	{ echo a; echo b; echo c; } >one &&
	239	git add one &&
	240	{ echo a; echo c; } >expect &&
	241	{ cat expect; echo; echo; } >one &&
	242	git diff -- one >patch &&
	243
	244	git checkout one &&
	245	git apply --whitespace=fix patch &&
	246	test_cmp expect one
	247	'
	248
efa57443 JH	249	test_expect_success 'blank at EOF with --whitespace=fix (3)' '
	250	{ echo a; echo b; echo; } >one &&
	251	git add one &&
	252	{ echo a; echo c; echo; } >expect &&
	253	{ cat expect; echo; echo; } >one &&
	254	git diff -- one >patch &&
	255
	256	git checkout one &&
	257	git apply --whitespace=fix patch &&
	258	test_cmp expect one
	259	'
	260
	261	test_expect_success 'blank at end of hunk, not at EOF with --whitespace=fix' '
	262	{ echo a; echo b; echo; echo; echo; echo; echo; echo d; } >one &&
	263	git add one &&
	264	{ echo a; echo c; echo; echo; echo; echo; echo; echo; echo d; } >expect &&
	265	cp expect one &&
	266	git diff -- one >patch &&
	267
	268	git checkout one &&
	269	git apply --whitespace=fix patch &&
	270	test_cmp expect one
	271	'
	272
77b15bbd JH	273	test_expect_success 'blank at EOF with --whitespace=warn' '
	274	{ echo a; echo b; echo c; } >one &&
	275	git add one &&
	276	echo >>one &&
	277	cat one >expect &&
	278	git diff -- one >patch &&
	279
	280	git checkout one &&
	281	git apply --whitespace=warn patch 2>error &&
	282	test_cmp expect one &&
	283	grep "new blank line at EOF" error
	284	'
	285
	286	test_expect_success 'blank at EOF with --whitespace=error' '
	287	{ echo a; echo b; echo c; } >one &&
	288	git add one &&
	289	cat one >expect &&
	290	echo >>one &&
	291	git diff -- one >patch &&
	292
	293	git checkout one &&
	294	test_must_fail git apply --whitespace=error patch 2>error &&
	295	test_cmp expect one &&
	296	grep "new blank line at EOF" error
	297	'
	298
94ea026b JH	299	test_expect_success 'blank but not empty at EOF' '
	300	{ echo a; echo b; echo c; } >one &&
	301	git add one &&
	302	echo " " >>one &&
	303	cat one >expect &&
	304	git diff -- one >patch &&
	305
	306	git checkout one &&
	307	git apply --whitespace=warn patch 2>error &&
	308	test_cmp expect one &&
	309	grep "new blank line at EOF" error
	310	'
	311
c1376c12 BG	312	test_expect_success 'applying beyond EOF requires one non-blank context line' '
	313	{ echo; echo; echo; echo; } >one &&
	314	git add one &&
	315	{ echo b; } >>one &&
	316	git diff -- one >patch &&
	317
	318	git checkout one &&
	319	{ echo a; echo; } >one &&
	320	cp one expect &&
	321	test_must_fail git apply --whitespace=fix patch &&
dcbaa0b3	322	test_cmp expect one &&
c1376c12	323	test_must_fail git apply --ignore-space-change --whitespace=fix patch &&
dcbaa0b3	324	test_cmp expect one
c1376c12 BG	325	'
	326
	327	test_expect_success 'tons of blanks at EOF should not apply' '
	328	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
	329	echo; echo; echo; echo;
	330	done >one &&
	331	git add one &&
	332	echo a >>one &&
	333	git diff -- one >patch &&
	334
	335	>one &&
	336	test_must_fail git apply --whitespace=fix patch &&
	337	test_must_fail git apply --ignore-space-change --whitespace=fix patch
	338	'
	339
	340	test_expect_success 'missing blank line at end with --whitespace=fix' '
	341	echo a >one &&
	342	echo >>one &&
	343	git add one &&
	344	echo b >>one &&
	345	cp one expect &&
	346	git diff -- one >patch &&
	347	echo a >one &&
	348	cp one saved-one &&
	349	test_must_fail git apply patch &&
	350	git apply --whitespace=fix patch &&
dcbaa0b3	351	test_cmp expect one &&
c1376c12 BG	352	mv saved-one one &&
c1376c12 BG	353	git apply --ignore-space-change --whitespace=fix patch &&
dcbaa0b3	354	test_cmp expect one
c1376c12 BG	355	'
	356
	357	test_expect_success 'two missing blank lines at end with --whitespace=fix' '
	358	{ echo a; echo; echo b; echo c; } >one &&
	359	cp one no-blank-lines &&
	360	{ echo; echo; } >>one &&
	361	git add one &&
	362	echo d >>one &&
	363	cp one expect &&
	364	echo >>one &&
	365	git diff -- one >patch &&
	366	cp no-blank-lines one &&
	367	test_must_fail git apply patch &&
	368	git apply --whitespace=fix patch &&
dcbaa0b3	369	test_cmp expect one &&
c1376c12 BG	370	mv no-blank-lines one &&
	371	test_must_fail git apply patch &&
	372	git apply --ignore-space-change --whitespace=fix patch &&
dcbaa0b3	373	test_cmp expect one
c1376c12 BG	374	'
c1376c12 BG	375
0c3ef984 BG	376	test_expect_success 'missing blank line at end, insert before end, --whitespace=fix' '
	377	{ echo a; echo; } >one &&
	378	git add one &&
	379	{ echo b; echo a; echo; } >one &&
	380	cp one expect &&
	381	git diff -- one >patch &&
	382	echo a >one &&
	383	test_must_fail git apply patch &&
	384	git apply --whitespace=fix patch &&
dcbaa0b3	385	test_cmp expect one
0c3ef984 BG	386	'
0c3ef984 BG	387
c1376c12 BG	388	test_expect_success 'shrink file with tons of missing blanks at end of file' '
	389	{ echo a; echo b; echo c; } >one &&
	390	cp one no-blank-lines &&
	391	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
	392	echo; echo; echo; echo;
	393	done >>one &&
	394	git add one &&
	395	echo a >one &&
	396	cp one expect &&
	397	git diff -- one >patch &&
	398	cp no-blank-lines one &&
	399	test_must_fail git apply patch &&
	400	git apply --whitespace=fix patch &&
dcbaa0b3	401	test_cmp expect one &&
c1376c12 BG	402	mv no-blank-lines one &&
c1376c12 BG	403	git apply --ignore-space-change --whitespace=fix patch &&
dcbaa0b3	404	test_cmp expect one
c1376c12 BG	405	'
	406
	407	test_expect_success 'missing blanks at EOF must only match blank lines' '
	408	{ echo a; echo b; } >one &&
	409	git add one &&
	410	{ echo c; echo d; } >>one &&
	411	git diff -- one >patch &&
	412
	413	echo a >one &&
2dec68cf	414	test_must_fail git apply patch &&
c1376c12 BG	415	test_must_fail git apply --whitespace=fix patch &&
	416	test_must_fail git apply --ignore-space-change --whitespace=fix patch
	417	'
	418
	419	sed -e's/Z//' >one <<EOF
	420	a
	421	b
	422	c
	423	Z
	424	EOF
	425
	426	test_expect_success 'missing blank line should match context line with spaces' '
	427	git add one &&
	428	echo d >>one &&
	429	git diff -- one >patch &&
	430	{ echo a; echo b; echo c; } >one &&
	431	cp one expect &&
	432	{ echo; echo d; } >>expect &&
	433	git add one &&
	434
	435	git apply --whitespace=fix patch &&
dcbaa0b3	436	test_cmp expect one
c1376c12 BG	437	'
	438
	439	sed -e's/Z//' >one <<EOF
	440	a
	441	b
	442	c
	443	Z
	444	EOF
	445
	446	test_expect_success 'same, but with the --ignore-space-option' '
	447	git add one &&
	448	echo d >>one &&
	449	cp one expect &&
	450	git diff -- one >patch &&
	451	{ echo a; echo b; echo c; } >one &&
	452	git add one &&
	453
	454	git checkout-index -f one &&
	455	git apply --ignore-space-change --whitespace=fix patch &&
dcbaa0b3	456	test_cmp expect one
c1376c12 BG	457	'
	458
	459	test_expect_success 'same, but with CR-LF line endings && cr-at-eol set' '
	460	git config core.whitespace cr-at-eol &&
	461	printf "a\r\n" >one &&
	462	printf "b\r\n" >>one &&
	463	printf "c\r\n" >>one &&
	464	cp one save-one &&
2dec68cf	465	printf " \r\n" >>one &&
c1376c12 BG	466	git add one &&
	467	printf "d\r\n" >>one &&
	468	cp one expect &&
	469	git diff -- one >patch &&
	470	mv save-one one &&
	471
	472	git apply --ignore-space-change --whitespace=fix patch &&
dcbaa0b3	473	test_cmp expect one
c1376c12 BG	474	'
c1376c12 BG	475
c24f3aba	476	test_expect_success 'CR-LF line endings && add line && text=auto' '
c1376c12 BG	477	git config --unset core.whitespace &&
c1376c12 BG	478	printf "a\r\n" >one &&
c24f3aba TB	479	cp one save-one &&
c24f3aba TB	480	git add one &&
c1376c12	481	printf "b\r\n" >>one &&
c24f3aba TB	482	cp one expect &&
	483	git diff -- one >patch &&
	484	mv save-one one &&
	485	echo "one text=auto" >.gitattributes &&
	486	git apply patch &&
dcbaa0b3	487	test_cmp expect one
c24f3aba TB	488	'
	489
	490	test_expect_success 'CR-LF line endings && change line && text=auto' '
	491	printf "a\r\n" >one &&
c1376c12	492	cp one save-one &&
c1376c12	493	git add one &&
c24f3aba	494	printf "b\r\n" >one &&
c1376c12	495	cp one expect &&
c1376c12 BG	496	git diff -- one >patch &&
c1376c12 BG	497	mv save-one one &&
c24f3aba TB	498	echo "one text=auto" >.gitattributes &&
c24f3aba TB	499	git apply patch &&
dcbaa0b3	500	test_cmp expect one
c24f3aba	501	'
c1376c12	502
c24f3aba TB	503	test_expect_success 'LF in repo, CRLF in worktree && change line && text=auto' '
	504	printf "a\n" >one &&
	505	git add one &&
	506	printf "b\r\n" >one &&
	507	git diff -- one >patch &&
	508	printf "a\r\n" >one &&
	509	echo "one text=auto" >.gitattributes &&
	510	git -c core.eol=CRLF apply patch &&
	511	printf "b\r\n" >expect &&
dcbaa0b3	512	test_cmp expect one
c1376c12 BG	513	'
c1376c12 BG	514
250b3c6c JH	515	test_expect_success 'whitespace=fix to expand' '
	516	qz_to_tab_space >preimage <<-\EOF &&
	517	QQa
	518	QQb
	519	QQc
	520	ZZZZZZZZZZZZZZZZd
	521	QQe
	522	QQf
	523	QQg
	524	EOF
	525	qz_to_tab_space >patch <<-\EOF &&
	526	diff --git a/preimage b/preimage
	527	--- a/preimage
	528	+++ b/preimage
	529	@@ -1,7 +1,6 @@
	530	QQa
	531	QQb
	532	QQc
	533	-QQd
	534	QQe
	535	QQf
	536	QQg
	537	EOF
	538	git -c core.whitespace=tab-in-indent apply --whitespace=fix patch
	539	'
	540
477a08af JH	541	test_expect_success 'whitespace check skipped for excluded paths' '
	542	git config core.whitespace blank-at-eol &&
	543	>used &&
	544	>unused &&
	545	git add used unused &&
	546	echo "used" >used &&
	547	echo "unused " >unused &&
	548	git diff-files -p used unused >patch &&
	549	git apply --include=used --stat --whitespace=error <patch
	550	'
	551
d5a41641	552	test_done