blob: d2b3109c2d37445f2f3cf9b892df67f7519191ff [file] [log] [blame]
Junio C Hamano49e703a2007-11-02 17:46:55 -07001#!/bin/sh
2
3test_description='diff whitespace error detection'
4
Ævar Arnfjörð Bjarmason7ff24782021-10-12 15:56:45 +02005TEST_PASSES_SANITIZE_LEAK=true
Junio C Hamano49e703a2007-11-02 17:46:55 -07006. ./test-lib.sh
7
8test_expect_success setup '
9
10 git config diff.color.whitespace "blue reverse" &&
11 >F &&
12 git add F &&
13 echo " Eight SP indent" >>F &&
14 echo " HT and SP indent" >>F &&
15 echo "With trailing SP " >>F &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -080016 echo "Carriage ReturnQ" | tr Q "\015" >>F &&
Junio C Hamano04c6e9e2008-08-11 22:15:28 -070017 echo "No problem" >>F &&
18 echo >>F
Junio C Hamano49e703a2007-11-02 17:46:55 -070019
20'
21
22blue_grep='7;34m' ;# ESC [ 7 ; 3 4 m
23
Junio C Hamanoeca44602009-12-26 13:53:17 -080024printf "\033[%s" "$blue_grep" >check-grep
25if (grep "$blue_grep" <check-grep | grep "$blue_grep") >/dev/null 2>&1
26then
27 grep_a=grep
28elif (grep -a "$blue_grep" <check-grep | grep -a "$blue_grep") >/dev/null 2>&1
29then
30 grep_a='grep -a'
31else
32 grep_a=grep ;# expected to fail...
33fi
34rm -f check-grep
35
36prepare_output () {
37 git diff --color >output
38 $grep_a "$blue_grep" output >error
39 $grep_a -v "$blue_grep" output >normal
Elijah Newren0564b3e2010-10-03 14:00:06 -060040 return 0
Junio C Hamanoeca44602009-12-26 13:53:17 -080041}
42
Junio C Hamano49e703a2007-11-02 17:46:55 -070043test_expect_success default '
44
Elijah Newren0564b3e2010-10-03 14:00:06 -060045 prepare_output &&
Junio C Hamano49e703a2007-11-02 17:46:55 -070046
47 grep Eight normal >/dev/null &&
48 grep HT error >/dev/null &&
49 grep With error >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -080050 grep Return error >/dev/null &&
Junio C Hamano49e703a2007-11-02 17:46:55 -070051 grep No normal >/dev/null
52
53'
54
Johannes Sixtf4b05a42010-11-30 09:29:11 +010055test_expect_success 'default (attribute)' '
56
57 test_might_fail git config --unset core.whitespace &&
58 echo "F whitespace" >.gitattributes &&
59 prepare_output &&
60
61 grep Eight error >/dev/null &&
62 grep HT error >/dev/null &&
63 grep With error >/dev/null &&
64 grep Return error >/dev/null &&
65 grep No normal >/dev/null
66
67'
68
69test_expect_success 'default, tabwidth=10 (attribute)' '
70
71 git config core.whitespace "tabwidth=10" &&
72 echo "F whitespace" >.gitattributes &&
73 prepare_output &&
74
75 grep Eight normal >/dev/null &&
76 grep HT error >/dev/null &&
77 grep With error >/dev/null &&
78 grep Return error >/dev/null &&
79 grep No normal >/dev/null
80
81'
82
83test_expect_success 'no check (attribute)' '
84
85 test_might_fail git config --unset core.whitespace &&
86 echo "F -whitespace" >.gitattributes &&
87 prepare_output &&
88
89 grep Eight normal >/dev/null &&
90 grep HT normal >/dev/null &&
91 grep With normal >/dev/null &&
92 grep Return normal >/dev/null &&
93 grep No normal >/dev/null
94
95'
96
97test_expect_success 'no check, tabwidth=10 (attribute), must be irrelevant' '
98
99 git config core.whitespace "tabwidth=10" &&
100 echo "F -whitespace" >.gitattributes &&
101 prepare_output &&
102
103 grep Eight normal >/dev/null &&
104 grep HT normal >/dev/null &&
105 grep With normal >/dev/null &&
106 grep Return normal >/dev/null &&
107 grep No normal >/dev/null
108
109'
110
Junio C Hamano49e703a2007-11-02 17:46:55 -0700111test_expect_success 'without -trail' '
112
Johannes Sixtf4b05a42010-11-30 09:29:11 +0100113 rm -f .gitattributes &&
Elijah Newren0564b3e2010-10-03 14:00:06 -0600114 git config core.whitespace -trail &&
115 prepare_output &&
Junio C Hamano49e703a2007-11-02 17:46:55 -0700116
117 grep Eight normal >/dev/null &&
118 grep HT error >/dev/null &&
119 grep With normal >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800120 grep Return normal >/dev/null &&
Junio C Hamano49e703a2007-11-02 17:46:55 -0700121 grep No normal >/dev/null
122
123'
124
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800125test_expect_success 'without -trail (attribute)' '
126
Elijah Newren0564b3e2010-10-03 14:00:06 -0600127 test_might_fail git config --unset core.whitespace &&
128 echo "F whitespace=-trail" >.gitattributes &&
129 prepare_output &&
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800130
131 grep Eight normal >/dev/null &&
132 grep HT error >/dev/null &&
133 grep With normal >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800134 grep Return normal >/dev/null &&
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800135 grep No normal >/dev/null
136
137'
138
Junio C Hamano49e703a2007-11-02 17:46:55 -0700139test_expect_success 'without -space' '
140
Elijah Newren0564b3e2010-10-03 14:00:06 -0600141 rm -f .gitattributes &&
142 git config core.whitespace -space &&
143 prepare_output &&
Junio C Hamano49e703a2007-11-02 17:46:55 -0700144
145 grep Eight normal >/dev/null &&
146 grep HT normal >/dev/null &&
147 grep With error >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800148 grep Return error >/dev/null &&
Junio C Hamano49e703a2007-11-02 17:46:55 -0700149 grep No normal >/dev/null
150
151'
152
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800153test_expect_success 'without -space (attribute)' '
154
Elijah Newren0564b3e2010-10-03 14:00:06 -0600155 test_might_fail git config --unset core.whitespace &&
156 echo "F whitespace=-space" >.gitattributes &&
157 prepare_output &&
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800158
159 grep Eight normal >/dev/null &&
160 grep HT normal >/dev/null &&
161 grep With error >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800162 grep Return error >/dev/null &&
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800163 grep No normal >/dev/null
164
165'
166
Junio C Hamano49e703a2007-11-02 17:46:55 -0700167test_expect_success 'with indent-non-tab only' '
168
Elijah Newren0564b3e2010-10-03 14:00:06 -0600169 rm -f .gitattributes &&
170 git config core.whitespace indent,-trailing,-space &&
171 prepare_output &&
Junio C Hamano49e703a2007-11-02 17:46:55 -0700172
173 grep Eight error >/dev/null &&
174 grep HT normal >/dev/null &&
175 grep With normal >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800176 grep Return normal >/dev/null &&
Junio C Hamano49e703a2007-11-02 17:46:55 -0700177 grep No normal >/dev/null
178
179'
180
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800181test_expect_success 'with indent-non-tab only (attribute)' '
182
Elijah Newren0564b3e2010-10-03 14:00:06 -0600183 test_might_fail git config --unset core.whitespace &&
184 echo "F whitespace=indent,-trailing,-space" >.gitattributes &&
185 prepare_output &&
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800186
187 grep Eight error >/dev/null &&
188 grep HT normal >/dev/null &&
189 grep With normal >/dev/null &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800190 grep Return normal >/dev/null &&
191 grep No normal >/dev/null
192
193'
194
Johannes Sixtf4b05a42010-11-30 09:29:11 +0100195test_expect_success 'with indent-non-tab only, tabwidth=10' '
196
197 rm -f .gitattributes &&
198 git config core.whitespace indent,tabwidth=10,-trailing,-space &&
199 prepare_output &&
200
201 grep Eight normal >/dev/null &&
202 grep HT normal >/dev/null &&
203 grep With normal >/dev/null &&
204 grep Return normal >/dev/null &&
205 grep No normal >/dev/null
206
207'
208
209test_expect_success 'with indent-non-tab only, tabwidth=10 (attribute)' '
210
211 test_might_fail git config --unset core.whitespace &&
212 echo "F whitespace=indent,-trailing,-space,tabwidth=10" >.gitattributes &&
213 prepare_output &&
214
215 grep Eight normal >/dev/null &&
216 grep HT normal >/dev/null &&
217 grep With normal >/dev/null &&
218 grep Return normal >/dev/null &&
219 grep No normal >/dev/null
220
221'
222
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800223test_expect_success 'with cr-at-eol' '
224
Elijah Newren0564b3e2010-10-03 14:00:06 -0600225 rm -f .gitattributes &&
226 git config core.whitespace cr-at-eol &&
227 prepare_output &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800228
229 grep Eight normal >/dev/null &&
230 grep HT error >/dev/null &&
231 grep With error >/dev/null &&
232 grep Return normal >/dev/null &&
233 grep No normal >/dev/null
234
235'
236
237test_expect_success 'with cr-at-eol (attribute)' '
238
Elijah Newren0564b3e2010-10-03 14:00:06 -0600239 test_might_fail git config --unset core.whitespace &&
240 echo "F whitespace=trailing,cr-at-eol" >.gitattributes &&
241 prepare_output &&
Junio C Hamanob2979ff2008-01-15 00:59:05 -0800242
243 grep Eight normal >/dev/null &&
244 grep HT error >/dev/null &&
245 grep With error >/dev/null &&
246 grep Return normal >/dev/null &&
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800247 grep No normal >/dev/null
248
249'
250
Junio C Hamano04c6e9e2008-08-11 22:15:28 -0700251test_expect_success 'trailing empty lines (1)' '
252
253 rm -f .gitattributes &&
254 test_must_fail git diff --check >output &&
Junio C Hamano5b5061e2009-09-03 22:30:27 -0700255 grep "new blank line at" output &&
Junio C Hamano04c6e9e2008-08-11 22:15:28 -0700256 grep "trailing whitespace" output
257
258'
259
260test_expect_success 'trailing empty lines (2)' '
261
262 echo "F -whitespace" >.gitattributes &&
263 git diff --check >output &&
SZEDER Gáborec10b012018-08-19 23:57:22 +0200264 test_must_be_empty output
Junio C Hamano04c6e9e2008-08-11 22:15:28 -0700265
266'
267
Christoph Mallon8837d332010-10-10 19:24:06 +0200268test_expect_success 'checkdiff shows correct line number for trailing blank lines' '
269
270 printf "a\nb\n" > G &&
271 git add G &&
272 printf "x\nx\nx\na\nb\nc\n\n" > G &&
273 [ "$(git diff --check -- G)" = "G:7: new blank line at EOF." ]
274
275'
276
Junio C Hamano39280972008-08-27 19:48:01 -0700277test_expect_success 'do not color trailing cr in context' '
Elijah Newren0564b3e2010-10-03 14:00:06 -0600278 test_might_fail git config --unset core.whitespace &&
Junio C Hamano39280972008-08-27 19:48:01 -0700279 rm -f .gitattributes &&
280 echo AAAQ | tr Q "\015" >G &&
281 git add G &&
Elijah Newren0564b3e2010-10-03 14:00:06 -0600282 echo BBBQ | tr Q "\015" >>G &&
Junio C Hamano39280972008-08-27 19:48:01 -0700283 git diff --color G | tr "\015" Q >output &&
284 grep "BBB.*${blue_grep}Q" output &&
285 grep "AAA.*\[mQ" output
286
287'
288
Junio C Hamano690ed842009-09-04 00:41:15 -0700289test_expect_success 'color new trailing blank lines' '
Eric Sunshine08495412021-12-09 00:11:05 -0500290 test_write_lines a b "" "" >x &&
Junio C Hamano690ed842009-09-04 00:41:15 -0700291 git add x &&
Eric Sunshine08495412021-12-09 00:11:05 -0500292 test_write_lines a "" "" "" c "" "" "" "" >x &&
Junio C Hamano690ed842009-09-04 00:41:15 -0700293 git diff --color x >output &&
Junio C Hamanoeca44602009-12-26 13:53:17 -0800294 cnt=$($grep_a "${blue_grep}" output | wc -l) &&
Junio C Hamano690ed842009-09-04 00:41:15 -0700295 test $cnt = 2
296'
297
Junio C Hamano49e703a2007-11-02 17:46:55 -0700298test_done