1#!/bin/sh
2#
3# Copyright (c) 2006 Johannes E. Schindelin
4#
5
6test_description='Test special whitespace in diff engine.
7
8'
9. ./test-lib.sh
10. "$TEST_DIRECTORY"/diff-lib.sh
11
12# Ray Lehtiniemi's example
13
14cat << EOF > x
15do {
16 nothing;
17} while (0);
18EOF
19
20git update-index --add x
21
22cat << EOF > x
23do
24{
25 nothing;
26}
27while (0);
28EOF
29
30cat << EOF > expect
31diff --git a/x b/x
32index 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);
43EOF
44
45git diff > out
46test_expect_success "Ray's example without options" 'test_cmp expect out'
47
48git diff -w > out
49test_expect_success "Ray's example with -w" 'test_cmp expect out'
50
51git diff -b > out
52test_expect_success "Ray's example with -b" 'test_cmp expect out'
53
54tr 'Q' '\015' << EOF > x
55whitespace at beginning
56whitespace change
57whitespace in the middle
58whitespace at end
59unchanged line
60CR at endQ
61EOF
62
63git update-index x
64
65tr '_' ' ' << EOF > x
66 whitespace at beginning
67whitespace change
68white space in the middle
69whitespace at end__
70unchanged line
71CR at end
72EOF
73
74tr 'Q_' '\015 ' << EOF > expect
75diff --git a/x b/x
76index 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
87+whitespace at end__
88 unchanged line
89-CR at endQ
90+CR at end
91EOF
92git diff > out
93test_expect_success 'another test, without options' 'test_cmp expect out'
94
95cat << EOF > expect
96EOF
97git diff -w > out
98test_expect_success 'another test, with -w' 'test_cmp expect out'
99git diff -w -b > out
100test_expect_success 'another test, with -w -b' 'test_cmp expect out'
101git diff -w --ignore-space-at-eol > out
102test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out'
103git diff -w -b --ignore-space-at-eol > out
104test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out'
105
106tr 'Q' '\015' << EOF > expect
107diff --git a/x b/x
108index 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
116+white space in the middle
117 whitespace at end
118 unchanged line
119 CR at endQ
120EOF
121git diff -b > out
122test_expect_success 'another test, with -b' 'test_cmp expect out'
123git diff -b --ignore-space-at-eol > out
124test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
125
126tr 'Q' '\015' << EOF > expect
127diff --git a/x b/x
128index 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
141EOF
142git diff --ignore-space-at-eol > out
143test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect out'
144
145test_expect_success 'check mixed spaces and tabs in indent' '
146
147 # This is indented with SP HT SP.
148 echo " foo();" > x &&
149 git diff --check | grep "space before tab in indent"
150
151'
152
153test_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
161test_expect_success 'check with no whitespace errors' '
162
163 git commit -m "snapshot" &&
164 echo "foo();" > x &&
165 git diff --check
166
167'
168
169test_expect_success 'check with trailing whitespace' '
170
171 echo "foo(); " > x &&
172 test_must_fail git diff --check
173
174'
175
176test_expect_success 'check with space before tab in indent' '
177
178 # indent has space followed by hard tab
179 echo " foo();" > x &&
180 test_must_fail git diff --check
181
182'
183
184test_expect_success '--check and --exit-code are not exclusive' '
185
186 git checkout x &&
187 git diff --check --exit-code
188
189'
190
191test_expect_success '--check and --quiet are not exclusive' '
192
193 git diff --check --quiet
194
195'
196
197test_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
205test_expect_success 'check staged with trailing whitespace' '
206
207 echo "foo(); " > x &&
208 git add x &&
209 test_must_fail git diff --cached --check
210
211'
212
213test_expect_success 'check staged with space before tab in indent' '
214
215 # indent has space followed by hard tab
216 echo " foo();" > x &&
217 git add x &&
218 test_must_fail git diff --cached --check
219
220'
221
222test_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
230test_expect_success 'check with trailing whitespace (diff-index)' '
231
232 echo "foo(); " > x &&
233 git add x &&
234 test_must_fail git diff-index --check HEAD
235
236'
237
238test_expect_success 'check with space before tab in indent (diff-index)' '
239
240 # indent has space followed by hard tab
241 echo " foo();" > x &&
242 git add x &&
243 test_must_fail git diff-index --check HEAD
244
245'
246
247test_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
255test_expect_success 'check staged with trailing whitespace (diff-index)' '
256
257 echo "foo(); " > x &&
258 git add x &&
259 test_must_fail git diff-index --cached --check HEAD
260
261'
262
263test_expect_success 'check staged with space before tab in indent (diff-index)' '
264
265 # indent has space followed by hard tab
266 echo " foo();" > x &&
267 git add x &&
268 test_must_fail git diff-index --cached --check HEAD
269
270'
271
272test_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
280test_expect_success 'check with trailing whitespace (diff-tree)' '
281
282 echo "foo(); " > x &&
283 git commit -m "another commit" x &&
284 test_must_fail git diff-tree --check HEAD^ HEAD
285
286'
287
288test_expect_success 'check with space before tab in indent (diff-tree)' '
289
290 # indent has space followed by hard tab
291 echo " foo();" > x &&
292 git commit -m "yet another" x &&
293 test_must_fail git diff-tree --check HEAD^ HEAD
294
295'
296
297test_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
305test_expect_success 'check trailing whitespace (trailing-space: on)' '
306
307 git config core.whitespace "trailing-space" &&
308 echo "foo (); " > x &&
309 test_must_fail git diff --check
310
311'
312
313test_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
322test_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 &&
327 test_must_fail git diff --check
328
329'
330
331test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
332
333 git config core.whitespace "-indent-with-non-tab" &&
334 echo " foo ();" > x &&
335 git diff --check
336
337'
338
339test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
340
341 git config core.whitespace "indent-with-non-tab" &&
342 echo " foo ();" > x &&
343 test_must_fail git diff --check
344
345'
346
347test_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 &&
351 test_must_fail git diff --check
352
353'
354
355test_expect_success 'check tabs as indentation (tab-in-indent: off)' '
356
357 git config core.whitespace "-tab-in-indent" &&
358 echo " foo ();" > x &&
359 git diff --check
360
361'
362
363test_expect_success 'check tabs as indentation (tab-in-indent: on)' '
364
365 git config core.whitespace "tab-in-indent" &&
366 echo " foo ();" > x &&
367 test_must_fail git diff --check
368
369'
370
371test_expect_success 'check tabs and spaces as indentation (tab-in-indent: on)' '
372
373 git config core.whitespace "tab-in-indent" &&
374 echo " foo ();" > x &&
375 test_must_fail git diff --check
376
377'
378
379test_expect_success 'check tab-in-indent and indent-with-non-tab conflict' '
380
381 git config core.whitespace "tab-in-indent,indent-with-non-tab" &&
382 echo "foo ();" > x &&
383 test_must_fail git diff --check
384
385'
386
387test_expect_success 'check tab-in-indent excluded from wildcard whitespace attribute' '
388
389 git config --unset core.whitespace &&
390 echo "x whitespace" > .gitattributes &&
391 echo " foo ();" > x &&
392 git diff --check &&
393 rm -f .gitattributes
394
395'
396
397test_expect_success 'line numbers in --check output are correct' '
398
399 echo "" > x &&
400 echo "foo(); " >> x &&
401 git diff --check | grep "x:2:"
402
403'
404
405test_expect_success 'checkdiff detects new trailing blank lines (1)' '
406 echo "foo();" >x &&
407 echo "" >>x &&
408 git diff --check | grep "new blank line"
409'
410
411test_expect_success 'checkdiff detects new trailing blank lines (2)' '
412 { echo a; echo b; echo; echo; } >x &&
413 git add x &&
414 { echo a; echo; echo; echo; echo; } >x &&
415 git diff --check | grep "new blank line"
416'
417
418test_expect_success 'checkdiff allows new blank lines' '
419 git checkout x &&
420 mv x y &&
421 (
422 echo "/* This is new */" &&
423 echo "" &&
424 cat y
425 ) >x &&
426 git diff --check
427'
428
429cat <<EOF >expect
430EOF
431test_expect_success 'whitespace-only changes not reported' '
432 git reset --hard &&
433 echo >x "hello world" &&
434 git add x &&
435 git commit -m "hello 1" &&
436 echo >x "hello world" &&
437 git diff -b >actual &&
438 test_cmp expect actual
439'
440
441cat <<EOF >expect
442diff --git a/x b/z
443similarity index NUM%
444rename from x
445rename to z
446index 380c32a..a97b785 100644
447EOF
448test_expect_success 'whitespace-only changes reported across renames' '
449 git reset --hard &&
450 for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
451 git add x &&
452 git commit -m "base" &&
453 sed -e "5s/^/ /" x >z &&
454 git rm x &&
455 git add z &&
456 git diff -w -M --cached |
457 sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual &&
458 test_cmp expect actual
459'
460
461cat >expected <<\EOF
462diff --git a/empty b/void
463similarity index 100%
464rename from empty
465rename to void
466EOF
467
468test_expect_success 'rename empty' '
469 git reset --hard &&
470 >empty &&
471 git add empty &&
472 git commit -m empty &&
473 git mv empty void &&
474 git diff -w --cached -M >current &&
475 test_cmp expected current
476'
477
478test_expect_success 'combined diff with autocrlf conversion' '
479
480 git reset --hard &&
481 echo >x hello &&
482 git commit -m "one side" x &&
483 git checkout HEAD^ &&
484 echo >x goodbye &&
485 git commit -m "the other side" x &&
486 git config core.autocrlf true &&
487 test_must_fail git merge master &&
488
489 git diff | sed -e "1,/^@@@/d" >actual &&
490 ! grep "^-" actual
491
492'
493
494# Start testing the colored format for whitespace checks
495
496test_expect_success 'setup diff colors' '
497 git config color.diff always &&
498 git config color.diff.plain normal &&
499 git config color.diff.meta bold &&
500 git config color.diff.frag cyan &&
501 git config color.diff.func normal &&
502 git config color.diff.old red &&
503 git config color.diff.new green &&
504 git config color.diff.commit yellow &&
505 git config color.diff.whitespace "normal red" &&
506
507 git config core.autocrlf false
508'
509cat >expected <<\EOF
510<BOLD>diff --git a/x b/x<RESET>
511<BOLD>index 9daeafb..2874b91 100644<RESET>
512<BOLD>--- a/x<RESET>
513<BOLD>+++ b/x<RESET>
514<CYAN>@@ -1 +1,4 @@<RESET>
515 test<RESET>
516<GREEN>+<RESET><GREEN>{<RESET>
517<GREEN>+<RESET><BRED> <RESET>
518<GREEN>+<RESET><GREEN>}<RESET>
519EOF
520
521test_expect_success 'diff that introduces a line with only tabs' '
522 git config core.whitespace blank-at-eol &&
523 git reset --hard &&
524 echo "test" > x &&
525 git commit -m "initial" x &&
526 echo "{NTN}" | tr "NT" "\n\t" >> x &&
527 git -c color.diff=always diff | test_decode_color >current &&
528 test_cmp expected current
529'
530
531test_done