[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
	# busybox's diff(1) doesn't output normal format
	if ! test -s fixed
	then
		$DIFF -u file target |
		grep -v '^+++ target' |
		sed -ne "/^+/s/+//p" >fixed
	fi

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