]>
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 | |
10 | . ../diff-lib.sh | |
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 |
5bd74506 | 46 | test_expect_success "Ray's example without options" 'git diff expect out' |
2344d47f | 47 | |
5be60078 | 48 | git diff -w > out |
5bd74506 | 49 | test_expect_success "Ray's example with -w" 'git diff expect out' |
2344d47f | 50 | |
5be60078 | 51 | git diff -b > out |
5bd74506 | 52 | test_expect_success "Ray's example with -b" 'git diff 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 |
62 | ||
5be60078 | 63 | git update-index x |
2344d47f JS |
64 | |
65 | cat << EOF > x | |
66 | whitespace at beginning | |
67 | whitespace change | |
68 | white space in the middle | |
69 | whitespace at end | |
70 | unchanged line | |
71 | CR at end | |
72 | EOF | |
73 | ||
4035b46e | 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 | |
87 | +whitespace at end | |
88 | unchanged line | |
4035b46e | 89 | -CR at endQ |
2344d47f JS |
90 | +CR at end |
91 | EOF | |
5be60078 | 92 | git diff > out |
5bd74506 | 93 | test_expect_success 'another test, without options' 'git diff expect out' |
2344d47f JS |
94 | |
95 | cat << EOF > expect | |
96 | diff --git a/x b/x | |
97 | index d99af23..8b32fb5 100644 | |
98 | EOF | |
5be60078 | 99 | git diff -w > out |
5bd74506 | 100 | test_expect_success 'another test, with -w' 'git diff expect out' |
2344d47f | 101 | |
4035b46e | 102 | tr 'Q' '\015' << EOF > expect |
2344d47f JS |
103 | diff --git a/x b/x |
104 | index d99af23..8b32fb5 100644 | |
105 | --- a/x | |
106 | +++ b/x | |
107 | @@ -1,6 +1,6 @@ | |
108 | -whitespace at beginning | |
109 | + whitespace at beginning | |
110 | whitespace change | |
111 | -whitespace in the middle | |
2344d47f | 112 | +white space in the middle |
c7c24889 | 113 | whitespace at end |
2344d47f | 114 | unchanged line |
c7c24889 | 115 | CR at endQ |
2344d47f | 116 | EOF |
5be60078 | 117 | git diff -b > out |
5bd74506 | 118 | test_expect_success 'another test, with -b' 'git diff expect out' |
2344d47f | 119 | |
86f8c236 WC |
120 | test_expect_success 'check mixed spaces and tabs in indent' ' |
121 | ||
122 | # This is indented with SP HT SP. | |
123 | echo " foo();" > x && | |
c1795bb0 | 124 | git diff --check | grep "Space in indent is followed by a tab" |
86f8c236 WC |
125 | |
126 | ' | |
127 | ||
62c64895 WC |
128 | test_expect_success 'check with no whitespace errors' ' |
129 | ||
130 | git commit -m "snapshot" && | |
131 | echo "foo();" > x && | |
132 | git diff --check | |
133 | ||
134 | ' | |
135 | ||
136 | test_expect_failure 'check with trailing whitespace' ' | |
137 | ||
138 | echo "foo(); " > x && | |
139 | git diff --check | |
140 | ||
141 | ' | |
142 | ||
143 | test_expect_failure 'check with space before tab in indent' ' | |
144 | ||
145 | # indent has space followed by hard tab | |
146 | echo " foo();" > x && | |
147 | git diff --check | |
148 | ||
149 | ' | |
150 | ||
da31b358 | 151 | test_expect_success '--check and --exit-code are not exclusive' ' |
62c64895 WC |
152 | |
153 | git checkout x && | |
154 | git diff --check --exit-code | |
155 | ||
156 | ' | |
157 | ||
da31b358 | 158 | test_expect_success '--check and --quiet are not exclusive' ' |
62c64895 WC |
159 | |
160 | git diff --check --quiet | |
161 | ||
162 | ' | |
163 | ||
164 | test_expect_success 'check staged with no whitespace errors' ' | |
165 | ||
166 | echo "foo();" > x && | |
167 | git add x && | |
168 | git diff --cached --check | |
169 | ||
170 | ' | |
171 | ||
172 | test_expect_failure 'check staged with trailing whitespace' ' | |
173 | ||
174 | echo "foo(); " > x && | |
175 | git add x && | |
176 | git diff --cached --check | |
177 | ||
178 | ' | |
179 | ||
180 | test_expect_failure 'check staged with space before tab in indent' ' | |
181 | ||
182 | # indent has space followed by hard tab | |
183 | echo " foo();" > x && | |
184 | git add x && | |
185 | git diff --cached --check | |
186 | ||
187 | ' | |
188 | ||
189 | test_expect_success 'check with no whitespace errors (diff-index)' ' | |
190 | ||
191 | echo "foo();" > x && | |
192 | git add x && | |
193 | git diff-index --check HEAD | |
194 | ||
195 | ' | |
196 | ||
197 | test_expect_failure 'check with trailing whitespace (diff-index)' ' | |
198 | ||
199 | echo "foo(); " > x && | |
200 | git add x && | |
201 | git diff-index --check HEAD | |
202 | ||
203 | ' | |
204 | ||
205 | test_expect_failure 'check with space before tab in indent (diff-index)' ' | |
206 | ||
207 | # indent has space followed by hard tab | |
208 | echo " foo();" > x && | |
209 | git add x && | |
210 | git diff-index --check HEAD | |
211 | ||
212 | ' | |
213 | ||
214 | test_expect_success 'check staged with no whitespace errors (diff-index)' ' | |
215 | ||
216 | echo "foo();" > x && | |
217 | git add x && | |
218 | git diff-index --cached --check HEAD | |
219 | ||
220 | ' | |
221 | ||
222 | test_expect_failure 'check staged with trailing whitespace (diff-index)' ' | |
223 | ||
224 | echo "foo(); " > x && | |
225 | git add x && | |
226 | git diff-index --cached --check HEAD | |
227 | ||
228 | ' | |
229 | ||
230 | test_expect_failure 'check staged with space before tab in indent (diff-index)' ' | |
231 | ||
232 | # indent has space followed by hard tab | |
233 | echo " foo();" > x && | |
234 | git add x && | |
235 | git diff-index --cached --check HEAD | |
236 | ||
237 | ' | |
238 | ||
239 | test_expect_success 'check with no whitespace errors (diff-tree)' ' | |
240 | ||
241 | echo "foo();" > x && | |
242 | git commit -m "new commit" x && | |
243 | git diff-tree --check HEAD^ HEAD | |
244 | ||
245 | ' | |
246 | ||
247 | test_expect_failure 'check with trailing whitespace (diff-tree)' ' | |
248 | ||
249 | echo "foo(); " > x && | |
250 | git commit -m "another commit" x && | |
251 | git diff-tree --check HEAD^ HEAD | |
252 | ||
253 | ' | |
254 | ||
255 | test_expect_failure 'check with space before tab in indent (diff-tree)' ' | |
256 | ||
257 | # indent has space followed by hard tab | |
258 | echo " foo();" > x && | |
259 | git commit -m "yet another" x && | |
260 | git diff-tree --check HEAD^ HEAD | |
261 | ||
262 | ' | |
263 | ||
2344d47f | 264 | test_done |