[thirdparty/git.git] / t / t4015-diff-whitespace.sh

#!/bin/sh
#
# Copyright (c) 2006 Johannes E. Schindelin
#

test_description='Test special whitespace in diff engine.

'
. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh

# Ray Lehtiniemi's example

cat << EOF > x
do {
   nothing;
} while (0);
EOF

git update-index --add x

cat << EOF > x
do
{
   nothing;
}
while (0);
EOF

cat << EOF > expect
diff --git a/x b/x
index adf3937..6edc172 100644
--- a/x
+++ b/x
@@ -1,3 +1,5 @@
-do {
+do
+{
    nothing;
-} while (0);
+}
+while (0);
EOF

git diff > out
test_expect_success "Ray's example without options" 'test_cmp expect out'

git diff -w > out
test_expect_success "Ray's example with -w" 'test_cmp expect out'

git diff -b > out
test_expect_success "Ray's example with -b" 'test_cmp expect out'

tr 'Q' '\015' << EOF > x
whitespace at beginning
whitespace change
whitespace in the middle
whitespace at end
unchanged line
CR at endQ
EOF

git update-index x

tr '_' ' ' << EOF > x
	whitespace at beginning
whitespace 	 change
white space in the middle
whitespace at end__
unchanged line
CR at end
EOF

tr 'Q_' '\015 ' << EOF > expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
+++ b/x
@@ -1,6 +1,6 @@
-whitespace at beginning
-whitespace change
-whitespace in the middle
-whitespace at end
+	whitespace at beginning
+whitespace 	 change
+white space in the middle
+whitespace at end__
 unchanged line
-CR at endQ
+CR at end
EOF
git diff > out
test_expect_success 'another test, without options' 'test_cmp expect out'

cat << EOF > expect
EOF
git diff -w > out
test_expect_success 'another test, with -w' 'test_cmp expect out'
git diff -w -b > out
test_expect_success 'another test, with -w -b' 'test_cmp expect out'
git diff -w --ignore-space-at-eol > out
test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out'
git diff -w -b --ignore-space-at-eol > out
test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out'

tr 'Q' '\015' << EOF > expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
+++ b/x
@@ -1,6 +1,6 @@
-whitespace at beginning
+	whitespace at beginning
 whitespace change
-whitespace in the middle
+white space in the middle
 whitespace at end
 unchanged line
 CR at endQ
EOF
git diff -b > out
test_expect_success 'another test, with -b' 'test_cmp expect out'
git diff -b --ignore-space-at-eol > out
test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'

tr 'Q' '\015' << EOF > expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
+++ b/x
@@ -1,6 +1,6 @@
-whitespace at beginning
-whitespace change
-whitespace in the middle
+	whitespace at beginning
+whitespace 	 change
+white space in the middle
 whitespace at end
 unchanged line
 CR at endQ
EOF
git diff --ignore-space-at-eol > out
test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect out'

test_expect_success 'check mixed spaces and tabs in indent' '

	# This is indented with SP HT SP.
	echo " 	 foo();" > x &&
	git diff --check | grep "space before tab in indent"

'

test_expect_success 'check mixed tabs and spaces in indent' '

	# This is indented with HT SP HT.
	echo "	 	foo();" > x &&
	git diff --check | grep "space before tab in indent"

'

test_expect_success 'check with no whitespace errors' '

	git commit -m "snapshot" &&
	echo "foo();" > x &&
	git diff --check

'

test_expect_success 'check with trailing whitespace' '

	echo "foo(); " > x &&
	test_must_fail git diff --check

'

test_expect_success 'check with space before tab in indent' '

	# indent has space followed by hard tab
	echo " 	foo();" > x &&
	test_must_fail git diff --check

'

test_expect_success '--check and --exit-code are not exclusive' '

	git checkout x &&
	git diff --check --exit-code

'

test_expect_success '--check and --quiet are not exclusive' '

	git diff --check --quiet

'

test_expect_success 'check staged with no whitespace errors' '

	echo "foo();" > x &&
	git add x &&
	git diff --cached --check

'

test_expect_success 'check staged with trailing whitespace' '

	echo "foo(); " > x &&
	git add x &&
	test_must_fail git diff --cached --check

'

test_expect_success 'check staged with space before tab in indent' '

	# indent has space followed by hard tab
	echo " 	foo();" > x &&
	git add x &&
	test_must_fail git diff --cached --check

'

test_expect_success 'check with no whitespace errors (diff-index)' '

	echo "foo();" > x &&
	git add x &&
	git diff-index --check HEAD

'

test_expect_success 'check with trailing whitespace (diff-index)' '

	echo "foo(); " > x &&
	git add x &&
	test_must_fail git diff-index --check HEAD

'

test_expect_success 'check with space before tab in indent (diff-index)' '

	# indent has space followed by hard tab
	echo " 	foo();" > x &&
	git add x &&
	test_must_fail git diff-index --check HEAD

'

test_expect_success 'check staged with no whitespace errors (diff-index)' '

	echo "foo();" > x &&
	git add x &&
	git diff-index --cached --check HEAD

'

test_expect_success 'check staged with trailing whitespace (diff-index)' '

	echo "foo(); " > x &&
	git add x &&
	test_must_fail git diff-index --cached --check HEAD

'

test_expect_success 'check staged with space before tab in indent (diff-index)' '

	# indent has space followed by hard tab
	echo " 	foo();" > x &&
	git add x &&
	test_must_fail git diff-index --cached --check HEAD

'

test_expect_success 'check with no whitespace errors (diff-tree)' '

	echo "foo();" > x &&
	git commit -m "new commit" x &&
	git diff-tree --check HEAD^ HEAD

'

test_expect_success 'check with trailing whitespace (diff-tree)' '

	echo "foo(); " > x &&
	git commit -m "another commit" x &&
	test_must_fail git diff-tree --check HEAD^ HEAD

'

test_expect_success 'check with space before tab in indent (diff-tree)' '

	# indent has space followed by hard tab
	echo " 	foo();" > x &&
	git commit -m "yet another" x &&
	test_must_fail git diff-tree --check HEAD^ HEAD

'

test_expect_success 'check trailing whitespace (trailing-space: off)' '

	git config core.whitespace "-trailing-space" &&
	echo "foo ();   " > x &&
	git diff --check

'

test_expect_success 'check trailing whitespace (trailing-space: on)' '

	git config core.whitespace "trailing-space" &&
	echo "foo ();   " > x &&
	test_must_fail git diff --check

'

test_expect_success 'check space before tab in indent (space-before-tab: off)' '

	# indent contains space followed by HT
	git config core.whitespace "-space-before-tab" &&
	echo " 	foo ();" > x &&
	git diff --check

'

test_expect_success 'check space before tab in indent (space-before-tab: on)' '

	# indent contains space followed by HT
	git config core.whitespace "space-before-tab" &&
	echo " 	foo ();   " > x &&
	test_must_fail git diff --check

'

test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '

	git config core.whitespace "-indent-with-non-tab"
	echo "        foo ();" > x &&
	git diff --check

'

test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '

	git config core.whitespace "indent-with-non-tab" &&
	echo "        foo ();" > x &&
	test_must_fail git diff --check

'

test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '

	git config core.whitespace "indent-with-non-tab" &&
	echo "	                foo ();" > x &&
	test_must_fail git diff --check

'

test_expect_success 'line numbers in --check output are correct' '

	echo "" > x &&
	echo "foo(); " >> x &&
	git diff --check | grep "x:2:"

'

test_expect_success 'checkdiff detects new trailing blank lines (1)' '
	echo "foo();" >x &&
	echo "" >>x &&
	git diff --check | grep "new blank line"
'

test_expect_success 'checkdiff detects new trailing blank lines (2)' '
	{ echo a; echo b; echo; echo; } >x &&
	git add x &&
	{ echo a; echo; echo; echo; echo; } >x &&
	git diff --check | grep "new blank line"
'

test_expect_success 'checkdiff allows new blank lines' '
	git checkout x &&
	mv x y &&
	(
		echo "/* This is new */" &&
		echo "" &&
		cat y
	) >x &&
	git diff --check
'

cat <<EOF >expect
EOF
test_expect_success 'whitespace-only changes not reported' '
	git reset --hard &&
	echo >x "hello world" &&
	git add x &&
	git commit -m "hello 1" &&
	echo >x "hello  world" &&
	git diff -b >actual &&
	test_cmp expect actual
'

test_expect_success 'combined diff with autocrlf conversion' '

	git reset --hard &&
	echo >x hello &&
	git commit -m "one side" x &&
	git checkout HEAD^ &&
	echo >x goodbye &&
	git commit -m "the other side" x &&
	git config core.autocrlf true &&
	test_must_fail git merge master &&

	git diff | sed -e "1,/^@@@/d" >actual &&
	! grep "^-" actual

'

test_done
Commit	Line	Data
2344d47f JS	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Johannes E. Schindelin
	4	#
	5
	6	test_description='Test special whitespace in diff engine.
	7
	8	'
	9	. ./test-lib.sh
bfdbee98	10	. "$TEST_DIRECTORY"/diff-lib.sh
2344d47f JS	11
	12	# Ray Lehtiniemi's example
	13
	14	cat << EOF > x
	15	do {
	16	nothing;
	17	} while (0);
	18	EOF
	19
5be60078	20	git update-index --add x
2344d47f JS	21
	22	cat << EOF > x
	23	do
	24	{
	25	nothing;
	26	}
	27	while (0);
	28	EOF
	29
	30	cat << EOF > expect
	31	diff --git a/x b/x
	32	index adf3937..6edc172 100644
	33	--- a/x
	34	+++ b/x
	35	@@ -1,3 +1,5 @@
	36	-do {
	37	+do
	38	+{
	39	nothing;
	40	-} while (0);
	41	+}
	42	+while (0);
	43	EOF
	44
5be60078	45	git diff > out
3af82863	46	test_expect_success "Ray's example without options" 'test_cmp expect out'
2344d47f	47
5be60078	48	git diff -w > out
3af82863	49	test_expect_success "Ray's example with -w" 'test_cmp expect out'
2344d47f	50
5be60078	51	git diff -b > out
3af82863	52	test_expect_success "Ray's example with -b" 'test_cmp expect out'
2344d47f	53
4035b46e	54	tr 'Q' '\015' << EOF > x
2344d47f JS	55	whitespace at beginning
	56	whitespace change
	57	whitespace in the middle
	58	whitespace at end
	59	unchanged line
4035b46e	60	CR at endQ
2344d47f JS	61	EOF
2344d47f JS	62
5be60078	63	git update-index x
2344d47f	64
74f16b0c	65	tr '_' ' ' << EOF > x
2344d47f JS	66	whitespace at beginning
	67	whitespace change
	68	white space in the middle
74f16b0c	69	whitespace at end__
2344d47f JS	70	unchanged line
	71	CR at end
	72	EOF
	73
74f16b0c	74	tr 'Q_' '\015 ' << EOF > expect
2344d47f JS	75	diff --git a/x b/x
	76	index d99af23..8b32fb5 100644
	77	--- a/x
	78	+++ b/x
	79	@@ -1,6 +1,6 @@
	80	-whitespace at beginning
	81	-whitespace change
	82	-whitespace in the middle
	83	-whitespace at end
	84	+ whitespace at beginning
	85	+whitespace change
	86	+white space in the middle
74f16b0c	87	+whitespace at end__
2344d47f	88	unchanged line
4035b46e	89	-CR at endQ
2344d47f JS	90	+CR at end
2344d47f JS	91	EOF
5be60078	92	git diff > out
3af82863	93	test_expect_success 'another test, without options' 'test_cmp expect out'
2344d47f JS	94
2344d47f JS	95	cat << EOF > expect
2344d47f	96	EOF
5be60078	97	git diff -w > out
3af82863	98	test_expect_success 'another test, with -w' 'test_cmp expect out'
7a383291	99	git diff -w -b > out
6d12acef	100	test_expect_success 'another test, with -w -b' 'test_cmp expect out'
7a383291	101	git diff -w --ignore-space-at-eol > out
6d12acef	102	test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out'
7a383291	103	git diff -w -b --ignore-space-at-eol > out
6d12acef	104	test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out'
2344d47f	105
4035b46e	106	tr 'Q' '\015' << EOF > expect
2344d47f JS	107	diff --git a/x b/x
	108	index d99af23..8b32fb5 100644
	109	--- a/x
	110	+++ b/x
	111	@@ -1,6 +1,6 @@
	112	-whitespace at beginning
	113	+ whitespace at beginning
	114	whitespace change
	115	-whitespace in the middle
2344d47f	116	+white space in the middle
c7c24889	117	whitespace at end
2344d47f	118	unchanged line
c7c24889	119	CR at endQ
2344d47f	120	EOF
5be60078	121	git diff -b > out
3af82863	122	test_expect_success 'another test, with -b' 'test_cmp expect out'
7a383291	123	git diff -b --ignore-space-at-eol > out
6d12acef	124	test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
7a383291 KC	125
	126	tr 'Q' '\015' << EOF > expect
	127	diff --git a/x b/x
	128	index d99af23..8b32fb5 100644
	129	--- a/x
	130	+++ b/x
	131	@@ -1,6 +1,6 @@
	132	-whitespace at beginning
	133	-whitespace change
	134	-whitespace in the middle
	135	+ whitespace at beginning
	136	+whitespace change
	137	+white space in the middle
	138	whitespace at end
	139	unchanged line
	140	CR at endQ
	141	EOF
	142	git diff --ignore-space-at-eol > out
	143	test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect out'
2344d47f	144
86f8c236 WC	145	test_expect_success 'check mixed spaces and tabs in indent' '
	146
	147	# This is indented with SP HT SP.
	148	echo " foo();" > x &&
420f4f04	149	git diff --check \| grep "space before tab in indent"
86f8c236 WC	150
	151	'
	152
9afa2d4a BF	153	test_expect_success 'check mixed tabs and spaces in indent' '
	154
	155	# This is indented with HT SP HT.
	156	echo " foo();" > x &&
	157	git diff --check \| grep "space before tab in indent"
	158
	159	'
	160
62c64895 WC	161	test_expect_success 'check with no whitespace errors' '
	162
	163	git commit -m "snapshot" &&
	164	echo "foo();" > x &&
	165	git diff --check
	166
	167	'
	168
f8175466	169	test_expect_success 'check with trailing whitespace' '
62c64895 WC	170
62c64895 WC	171	echo "foo(); " > x &&
d492b31c	172	test_must_fail git diff --check
62c64895 WC	173
	174	'
	175
f8175466	176	test_expect_success 'check with space before tab in indent' '
62c64895 WC	177
	178	# indent has space followed by hard tab
	179	echo " foo();" > x &&
d492b31c	180	test_must_fail git diff --check
62c64895 WC	181
	182	'
	183
da31b358	184	test_expect_success '--check and --exit-code are not exclusive' '
62c64895 WC	185
	186	git checkout x &&
	187	git diff --check --exit-code
	188
	189	'
	190
da31b358	191	test_expect_success '--check and --quiet are not exclusive' '
62c64895 WC	192
	193	git diff --check --quiet
	194
	195	'
	196
	197	test_expect_success 'check staged with no whitespace errors' '
	198
	199	echo "foo();" > x &&
	200	git add x &&
	201	git diff --cached --check
	202
	203	'
	204
f8175466	205	test_expect_success 'check staged with trailing whitespace' '
62c64895 WC	206
	207	echo "foo(); " > x &&
	208	git add x &&
d492b31c	209	test_must_fail git diff --cached --check
62c64895 WC	210
	211	'
	212
f8175466	213	test_expect_success 'check staged with space before tab in indent' '
62c64895 WC	214
	215	# indent has space followed by hard tab
	216	echo " foo();" > x &&
	217	git add x &&
d492b31c	218	test_must_fail git diff --cached --check
62c64895 WC	219
	220	'
	221
	222	test_expect_success 'check with no whitespace errors (diff-index)' '
	223
	224	echo "foo();" > x &&
	225	git add x &&
	226	git diff-index --check HEAD
	227
	228	'
	229
f8175466	230	test_expect_success 'check with trailing whitespace (diff-index)' '
62c64895 WC	231
	232	echo "foo(); " > x &&
	233	git add x &&
d492b31c	234	test_must_fail git diff-index --check HEAD
62c64895 WC	235
	236	'
	237
f8175466	238	test_expect_success 'check with space before tab in indent (diff-index)' '
62c64895 WC	239
	240	# indent has space followed by hard tab
	241	echo " foo();" > x &&
	242	git add x &&
d492b31c	243	test_must_fail git diff-index --check HEAD
62c64895 WC	244
	245	'
	246
	247	test_expect_success 'check staged with no whitespace errors (diff-index)' '
	248
	249	echo "foo();" > x &&
	250	git add x &&
	251	git diff-index --cached --check HEAD
	252
	253	'
	254
f8175466	255	test_expect_success 'check staged with trailing whitespace (diff-index)' '
62c64895 WC	256
	257	echo "foo(); " > x &&
	258	git add x &&
d492b31c	259	test_must_fail git diff-index --cached --check HEAD
62c64895 WC	260
	261	'
	262
f8175466	263	test_expect_success 'check staged with space before tab in indent (diff-index)' '
62c64895 WC	264
	265	# indent has space followed by hard tab
	266	echo " foo();" > x &&
	267	git add x &&
d492b31c	268	test_must_fail git diff-index --cached --check HEAD
62c64895 WC	269
	270	'
	271
	272	test_expect_success 'check with no whitespace errors (diff-tree)' '
	273
	274	echo "foo();" > x &&
	275	git commit -m "new commit" x &&
	276	git diff-tree --check HEAD^ HEAD
	277
	278	'
	279
f8175466	280	test_expect_success 'check with trailing whitespace (diff-tree)' '
62c64895 WC	281
	282	echo "foo(); " > x &&
	283	git commit -m "another commit" x &&
d492b31c	284	test_must_fail git diff-tree --check HEAD^ HEAD
62c64895 WC	285
	286	'
	287
f8175466	288	test_expect_success 'check with space before tab in indent (diff-tree)' '
62c64895 WC	289
	290	# indent has space followed by hard tab
	291	echo " foo();" > x &&
	292	git commit -m "yet another" x &&
d492b31c	293	test_must_fail git diff-tree --check HEAD^ HEAD
f8175466 JH	294
	295	'
	296
	297	test_expect_success 'check trailing whitespace (trailing-space: off)' '
	298
	299	git config core.whitespace "-trailing-space" &&
	300	echo "foo (); " > x &&
	301	git diff --check
	302
	303	'
	304
	305	test_expect_success 'check trailing whitespace (trailing-space: on)' '
	306
	307	git config core.whitespace "trailing-space" &&
	308	echo "foo (); " > x &&
d492b31c	309	test_must_fail git diff --check
f8175466 JH	310
	311	'
	312
	313	test_expect_success 'check space before tab in indent (space-before-tab: off)' '
	314
	315	# indent contains space followed by HT
	316	git config core.whitespace "-space-before-tab" &&
	317	echo " foo ();" > x &&
	318	git diff --check
	319
	320	'
	321
	322	test_expect_success 'check space before tab in indent (space-before-tab: on)' '
	323
	324	# indent contains space followed by HT
	325	git config core.whitespace "space-before-tab" &&
	326	echo " foo (); " > x &&
d492b31c	327	test_must_fail git diff --check
f8175466 JH	328
	329	'
	330
	331	test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
	332
	333	git config core.whitespace "-indent-with-non-tab"
4d9697c7	334	echo " foo ();" > x &&
f8175466 JH	335	git diff --check
	336
	337	'
	338
	339	test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
	340
	341	git config core.whitespace "indent-with-non-tab" &&
4d9697c7	342	echo " foo ();" > x &&
d492b31c	343	test_must_fail git diff --check
62c64895 WC	344
	345	'
	346
9afa2d4a BF	347	test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '
	348
	349	git config core.whitespace "indent-with-non-tab" &&
	350	echo " foo ();" > x &&
d492b31c	351	test_must_fail git diff --check
9afa2d4a BF	352
9afa2d4a BF	353	'
0ef617f4 JH	354
	355	test_expect_success 'line numbers in --check output are correct' '
	356
	357	echo "" > x &&
	358	echo "foo(); " >> x &&
	359	git diff --check \| grep "x:2:"
	360
	361	'
	362
5b5061ef	363	test_expect_success 'checkdiff detects new trailing blank lines (1)' '
877f23cc JH	364	echo "foo();" >x &&
877f23cc JH	365	echo "" >>x &&
5b5061ef	366	git diff --check \| grep "new blank line"
877f23cc JH	367	'
877f23cc JH	368
467babf8 JH	369	test_expect_success 'checkdiff detects new trailing blank lines (2)' '
	370	{ echo a; echo b; echo; echo; } >x &&
	371	git add x &&
	372	{ echo a; echo; echo; echo; echo; } >x &&
	373	git diff --check \| grep "new blank line"
877f23cc JH	374	'
877f23cc JH	375
c35539eb JH	376	test_expect_success 'checkdiff allows new blank lines' '
	377	git checkout x &&
	378	mv x y &&
	379	(
	380	echo "/* This is new */" &&
	381	echo "" &&
	382	cat y
	383	) >x &&
	384	git diff --check
	385	'
	386
3e97c7c6 GB	387	cat <<EOF >expect
	388	EOF
	389	test_expect_success 'whitespace-only changes not reported' '
	390	git reset --hard &&
	391	echo >x "hello world" &&
	392	git add x &&
	393	git commit -m "hello 1" &&
	394	echo >x "hello world" &&
	395	git diff -b >actual &&
	396	test_cmp expect actual
	397	'
	398
5e568f9e AG	399	test_expect_success 'combined diff with autocrlf conversion' '
	400
	401	git reset --hard &&
	402	echo >x hello &&
	403	git commit -m "one side" x &&
	404	git checkout HEAD^ &&
	405	echo >x goodbye &&
	406	git commit -m "the other side" x &&
	407	git config core.autocrlf true &&
	408	test_must_fail git merge master &&
	409
	410	git diff \| sed -e "1,/^@@@/d" >actual &&
	411	! grep "^-" actual
	412
	413	'
	414
2344d47f	415	test_done