blob: 1a8f44c44ca3cce70990ec56fec61894be9b3086 [file] [log] [blame]
Junio C Hamano634ede32007-02-14 14:54:00 -08001#!/bin/sh
2
3test_description='CRLF conversion'
4
5. ./test-lib.sh
6
Stephen Boydc4f3f552010-01-25 16:33:57 -08007has_cr() {
8 tr '\015' Q <"$1" | grep Q >/dev/null
Junio C Hamano634ede32007-02-14 14:54:00 -08009}
10
11test_expect_success setup '
12
Junio C Hamano5c66d0d2008-01-17 22:52:40 -080013 git config core.autocrlf false &&
Junio C Hamano634ede32007-02-14 14:54:00 -080014
15 for w in Hello world how are you; do echo $w; done >one &&
16 mkdir dir &&
17 for w in I am very very fine thank you; do echo $w; done >dir/two &&
Junio C Hamano163b9592007-04-19 22:37:19 -070018 for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
Junio C Hamano634ede32007-02-14 14:54:00 -080019 git add . &&
20
21 git commit -m initial &&
22
23 one=`git rev-parse HEAD:one` &&
24 dir=`git rev-parse HEAD:dir` &&
25 two=`git rev-parse HEAD:dir/two` &&
Junio C Hamano163b9592007-04-19 22:37:19 -070026 three=`git rev-parse HEAD:three` &&
Junio C Hamano634ede32007-02-14 14:54:00 -080027
28 for w in Some extra lines here; do echo $w; done >>one &&
29 git diff >patch.file &&
30 patched=`git hash-object --stdin <one` &&
31 git read-tree --reset -u HEAD &&
32
33 echo happy.
34'
35
Steffen Prohaska21e5ad52008-02-06 12:25:58 +010036test_expect_success 'safecrlf: autocrlf=input, all CRLF' '
37
38 git config core.autocrlf input &&
39 git config core.safecrlf true &&
40
41 for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
Stephan Beyerd492b312008-07-12 17:47:52 +020042 test_must_fail git add allcrlf
Steffen Prohaska21e5ad52008-02-06 12:25:58 +010043'
44
45test_expect_success 'safecrlf: autocrlf=input, mixed LF/CRLF' '
46
47 git config core.autocrlf input &&
48 git config core.safecrlf true &&
49
50 for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
Stephan Beyerd492b312008-07-12 17:47:52 +020051 test_must_fail git add mixed
Steffen Prohaska21e5ad52008-02-06 12:25:58 +010052'
53
54test_expect_success 'safecrlf: autocrlf=true, all LF' '
55
56 git config core.autocrlf true &&
57 git config core.safecrlf true &&
58
59 for w in I am all LF; do echo $w; done >alllf &&
Stephan Beyerd492b312008-07-12 17:47:52 +020060 test_must_fail git add alllf
Steffen Prohaska21e5ad52008-02-06 12:25:58 +010061'
62
63test_expect_success 'safecrlf: autocrlf=true mixed LF/CRLF' '
64
65 git config core.autocrlf true &&
66 git config core.safecrlf true &&
67
68 for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
Stephan Beyerd492b312008-07-12 17:47:52 +020069 test_must_fail git add mixed
Steffen Prohaska21e5ad52008-02-06 12:25:58 +010070'
71
72test_expect_success 'safecrlf: print warning only once' '
73
74 git config core.autocrlf input &&
75 git config core.safecrlf warn &&
76
77 for w in I am all LF; do echo $w; done >doublewarn &&
78 git add doublewarn &&
79 git commit -m "nowarn" &&
80 for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn &&
81 test $(git add doublewarn 2>&1 | grep "CRLF will be replaced by LF" | wc -l) = 1
82'
83
84test_expect_success 'switch off autocrlf, safecrlf, reset HEAD' '
85 git config core.autocrlf false &&
86 git config core.safecrlf false &&
87 git reset --hard HEAD^
88'
89
Junio C Hamano634ede32007-02-14 14:54:00 -080090test_expect_success 'update with autocrlf=input' '
91
Junio C Hamano163b9592007-04-19 22:37:19 -070092 rm -f tmp one dir/two three &&
Junio C Hamano634ede32007-02-14 14:54:00 -080093 git read-tree --reset -u HEAD &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -080094 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -080095
96 for f in one dir/two
97 do
98 append_cr <$f >tmp && mv -f tmp $f &&
99 git update-index -- $f || {
100 echo Oops
101 false
102 break
103 }
104 done &&
105
106 differs=`git diff-index --cached HEAD` &&
107 test -z "$differs" || {
108 echo Oops "$differs"
109 false
110 }
111
112'
113
114test_expect_success 'update with autocrlf=true' '
115
Junio C Hamano163b9592007-04-19 22:37:19 -0700116 rm -f tmp one dir/two three &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800117 git read-tree --reset -u HEAD &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800118 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800119
120 for f in one dir/two
121 do
122 append_cr <$f >tmp && mv -f tmp $f &&
123 git update-index -- $f || {
124 echo "Oops $f"
125 false
126 break
127 }
128 done &&
129
130 differs=`git diff-index --cached HEAD` &&
131 test -z "$differs" || {
132 echo Oops "$differs"
133 false
134 }
135
136'
137
138test_expect_success 'checkout with autocrlf=true' '
139
Junio C Hamano163b9592007-04-19 22:37:19 -0700140 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800141 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800142 git read-tree --reset -u HEAD &&
143
144 for f in one dir/two
145 do
Stephen Boydc4f3f552010-01-25 16:33:57 -0800146 remove_cr <"$f" >tmp && mv -f tmp $f &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800147 git update-index -- $f || {
148 echo "Eh? $f"
149 false
150 break
151 }
152 done &&
153 test "$one" = `git hash-object --stdin <one` &&
154 test "$two" = `git hash-object --stdin <dir/two` &&
155 differs=`git diff-index --cached HEAD` &&
156 test -z "$differs" || {
157 echo Oops "$differs"
158 false
159 }
160'
161
162test_expect_success 'checkout with autocrlf=input' '
163
Junio C Hamano163b9592007-04-19 22:37:19 -0700164 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800165 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800166 git read-tree --reset -u HEAD &&
167
168 for f in one dir/two
169 do
Stephen Boydc4f3f552010-01-25 16:33:57 -0800170 if has_cr "$f"
Junio C Hamano634ede32007-02-14 14:54:00 -0800171 then
172 echo "Eh? $f"
173 false
174 break
175 else
176 git update-index -- $f
177 fi
178 done &&
179 test "$one" = `git hash-object --stdin <one` &&
180 test "$two" = `git hash-object --stdin <dir/two` &&
181 differs=`git diff-index --cached HEAD` &&
182 test -z "$differs" || {
183 echo Oops "$differs"
184 false
185 }
186'
187
188test_expect_success 'apply patch (autocrlf=input)' '
189
Junio C Hamano163b9592007-04-19 22:37:19 -0700190 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800191 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800192 git read-tree --reset -u HEAD &&
193
194 git apply patch.file &&
195 test "$patched" = "`git hash-object --stdin <one`" || {
196 echo "Eh? apply without index"
197 false
198 }
199'
200
201test_expect_success 'apply patch --cached (autocrlf=input)' '
202
Junio C Hamano163b9592007-04-19 22:37:19 -0700203 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800204 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800205 git read-tree --reset -u HEAD &&
206
207 git apply --cached patch.file &&
208 test "$patched" = `git rev-parse :one` || {
209 echo "Eh? apply with --cached"
210 false
211 }
212'
213
214test_expect_success 'apply patch --index (autocrlf=input)' '
215
Junio C Hamano163b9592007-04-19 22:37:19 -0700216 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800217 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800218 git read-tree --reset -u HEAD &&
219
220 git apply --index patch.file &&
221 test "$patched" = `git rev-parse :one` &&
222 test "$patched" = `git hash-object --stdin <one` || {
223 echo "Eh? apply with --index"
224 false
225 }
226'
227
228test_expect_success 'apply patch (autocrlf=true)' '
229
Junio C Hamano163b9592007-04-19 22:37:19 -0700230 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800231 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800232 git read-tree --reset -u HEAD &&
233
Junio C Hamano634ede32007-02-14 14:54:00 -0800234 git apply patch.file &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800235 test "$patched" = "`remove_cr <one | git hash-object --stdin`" || {
Junio C Hamano634ede32007-02-14 14:54:00 -0800236 echo "Eh? apply without index"
237 false
238 }
239'
240
241test_expect_success 'apply patch --cached (autocrlf=true)' '
242
Junio C Hamano163b9592007-04-19 22:37:19 -0700243 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800244 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800245 git read-tree --reset -u HEAD &&
246
247 git apply --cached patch.file &&
248 test "$patched" = `git rev-parse :one` || {
249 echo "Eh? apply without index"
250 false
251 }
252'
253
Junio C Hamano67160272007-02-17 12:37:25 -0800254test_expect_success 'apply patch --index (autocrlf=true)' '
255
Junio C Hamano163b9592007-04-19 22:37:19 -0700256 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800257 git config core.autocrlf true &&
Junio C Hamano67160272007-02-17 12:37:25 -0800258 git read-tree --reset -u HEAD &&
259
260 git apply --index patch.file &&
261 test "$patched" = `git rev-parse :one` &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800262 test "$patched" = "`remove_cr <one | git hash-object --stdin`" || {
Junio C Hamano67160272007-02-17 12:37:25 -0800263 echo "Eh? apply with --index"
264 false
265 }
266'
267
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700268test_expect_success '.gitattributes says two is binary' '
269
Junio C Hamano163b9592007-04-19 22:37:19 -0700270 rm -f tmp one dir/two three &&
Junio C Hamanoe4aee102007-04-15 14:56:09 -0700271 echo "two -crlf" >.gitattributes &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800272 git config core.autocrlf true &&
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700273 git read-tree --reset -u HEAD &&
274
Stephen Boydc4f3f552010-01-25 16:33:57 -0800275 if has_cr dir/two
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700276 then
277 echo "Huh?"
278 false
279 else
280 : happy
281 fi &&
282
Stephen Boydc4f3f552010-01-25 16:33:57 -0800283 if has_cr one
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700284 then
285 : happy
286 else
287 echo "Huh?"
288 false
Junio C Hamano163b9592007-04-19 22:37:19 -0700289 fi &&
290
Stephen Boydc4f3f552010-01-25 16:33:57 -0800291 if has_cr three
Junio C Hamano163b9592007-04-19 22:37:19 -0700292 then
293 echo "Huh?"
294 false
295 else
296 : happy
297 fi
298'
299
300test_expect_success '.gitattributes says two is input' '
301
302 rm -f tmp one dir/two three &&
303 echo "two crlf=input" >.gitattributes &&
304 git read-tree --reset -u HEAD &&
305
Stephen Boydc4f3f552010-01-25 16:33:57 -0800306 if has_cr dir/two
Junio C Hamano163b9592007-04-19 22:37:19 -0700307 then
308 echo "Huh?"
309 false
310 else
311 : happy
312 fi
313'
314
315test_expect_success '.gitattributes says two and three are text' '
316
317 rm -f tmp one dir/two three &&
318 echo "t* crlf" >.gitattributes &&
319 git read-tree --reset -u HEAD &&
320
Stephen Boydc4f3f552010-01-25 16:33:57 -0800321 if has_cr dir/two
Junio C Hamano163b9592007-04-19 22:37:19 -0700322 then
323 : happy
324 else
325 echo "Huh?"
326 false
327 fi &&
328
Stephen Boydc4f3f552010-01-25 16:33:57 -0800329 if has_cr three
Junio C Hamano163b9592007-04-19 22:37:19 -0700330 then
331 : happy
332 else
333 echo "Huh?"
334 false
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700335 fi
336'
337
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700338test_expect_success 'in-tree .gitattributes (1)' '
339
340 echo "one -crlf" >>.gitattributes &&
341 git add .gitattributes &&
342 git commit -m "Add .gitattributes" &&
343
344 rm -rf tmp one dir .gitattributes patch.file three &&
345 git read-tree --reset -u HEAD &&
346
Stephen Boydc4f3f552010-01-25 16:33:57 -0800347 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700348 then
349 echo "Eh? one should not have CRLF"
350 false
351 else
352 : happy
353 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800354 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700355 echo "Eh? three should still have CRLF"
356 false
357 }
358'
359
360test_expect_success 'in-tree .gitattributes (2)' '
361
362 rm -rf tmp one dir .gitattributes patch.file three &&
363 git read-tree --reset HEAD &&
364 git checkout-index -f -q -u -a &&
365
Stephen Boydc4f3f552010-01-25 16:33:57 -0800366 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700367 then
368 echo "Eh? one should not have CRLF"
369 false
370 else
371 : happy
372 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800373 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700374 echo "Eh? three should still have CRLF"
375 false
376 }
377'
378
379test_expect_success 'in-tree .gitattributes (3)' '
380
381 rm -rf tmp one dir .gitattributes patch.file three &&
382 git read-tree --reset HEAD &&
383 git checkout-index -u .gitattributes &&
384 git checkout-index -u one dir/two three &&
385
Stephen Boydc4f3f552010-01-25 16:33:57 -0800386 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700387 then
388 echo "Eh? one should not have CRLF"
389 false
390 else
391 : happy
392 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800393 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700394 echo "Eh? three should still have CRLF"
395 false
396 }
397'
398
399test_expect_success 'in-tree .gitattributes (4)' '
400
401 rm -rf tmp one dir .gitattributes patch.file three &&
402 git read-tree --reset HEAD &&
403 git checkout-index -u one dir/two three &&
404 git checkout-index -u .gitattributes &&
405
Stephen Boydc4f3f552010-01-25 16:33:57 -0800406 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700407 then
408 echo "Eh? one should not have CRLF"
409 false
410 else
411 : happy
412 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800413 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700414 echo "Eh? three should still have CRLF"
415 false
416 }
417'
418
Kristian Amlieb9970452009-03-20 10:32:09 +0100419test_expect_success 'checkout with existing .gitattributes' '
420
421 git config core.autocrlf true &&
422 git config --unset core.safecrlf &&
423 echo ".file2 -crlfQ" | q_to_cr >> .gitattributes &&
424 git add .gitattributes &&
425 git commit -m initial &&
426 echo ".file -crlfQ" | q_to_cr >> .gitattributes &&
427 echo "contents" > .file &&
428 git add .gitattributes .file &&
429 git commit -m second &&
430
431 git checkout master~1 &&
432 git checkout master &&
433 test "$(git diff-files --raw)" = ""
434
435'
436
437test_expect_success 'checkout when deleting .gitattributes' '
438
439 git rm .gitattributes &&
440 echo "contentsQ" | q_to_cr > .file2 &&
441 git add .file2 &&
Jonathan Nieder2dec68c2010-10-31 02:30:58 -0500442 git commit -m third &&
Kristian Amlieb9970452009-03-20 10:32:09 +0100443
444 git checkout master~1 &&
445 git checkout master &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800446 has_cr .file2
Kristian Amlieb9970452009-03-20 10:32:09 +0100447
448'
449
Steffen Prohaskad7b0a092007-10-18 22:02:35 +0200450test_expect_success 'invalid .gitattributes (must not crash)' '
451
452 echo "three +crlf" >>.gitattributes &&
453 git diff
454
455'
Finn Arne Gangstadc4805392010-05-12 00:37:57 +0200456# Some more tests here to add new autocrlf functionality.
457# We want to have a known state here, so start a bit from scratch
458
459test_expect_success 'setting up for new autocrlf tests' '
460 git config core.autocrlf false &&
461 git config core.safecrlf false &&
462 rm -rf .????* * &&
463 for w in I am all LF; do echo $w; done >alllf &&
464 for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
465 for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
466 git add -A . &&
467 git commit -m "alllf, allcrlf and mixed only" &&
468 git tag -a -m "message" autocrlf-checkpoint
469'
470
471test_expect_success 'report no change after setting autocrlf' '
472 git config core.autocrlf true &&
473 touch * &&
474 git diff --exit-code
475'
476
477test_expect_success 'files are clean after checkout' '
478 rm * &&
479 git checkout -f &&
480 git diff --exit-code
481'
482
483cr_to_Q_no_NL () {
484 tr '\015' Q | tr -d '\012'
485}
486
487test_expect_success 'LF only file gets CRLF with autocrlf' '
488 test "$(cr_to_Q_no_NL < alllf)" = "IQamQallQLFQ"
489'
490
491test_expect_success 'Mixed file is still mixed with autocrlf' '
492 test "$(cr_to_Q_no_NL < mixed)" = "OhhereisCRLFQintext"
493'
494
495test_expect_success 'CRLF only file has CRLF with autocrlf' '
496 test "$(cr_to_Q_no_NL < allcrlf)" = "IQamQallQCRLFQ"
497'
498
499test_expect_success 'New CRLF file gets LF in repo' '
500 tr -d "\015" < alllf | append_cr > alllf2 &&
501 git add alllf2 &&
502 git commit -m "alllf2 added" &&
503 git config core.autocrlf false &&
504 rm * &&
505 git checkout -f &&
506 test_cmp alllf alllf2
507'
Steffen Prohaskad7b0a092007-10-18 22:02:35 +0200508
Junio C Hamano634ede32007-02-14 14:54:00 -0800509test_done