blob: e526184a0bfa3c8ad2171d0c41a7bee22cf9a04e [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
Junio C Hamano5430bb22013-06-24 14:35:04 -070084
85test_expect_success 'safecrlf: git diff demotes safecrlf=true to warn' '
86 git config core.autocrlf input &&
87 git config core.safecrlf true &&
88 git diff HEAD
89'
90
91
Steffen Prohaska21e5ad52008-02-06 12:25:58 +010092test_expect_success 'switch off autocrlf, safecrlf, reset HEAD' '
93 git config core.autocrlf false &&
94 git config core.safecrlf false &&
95 git reset --hard HEAD^
96'
97
Junio C Hamano634ede32007-02-14 14:54:00 -080098test_expect_success 'update with autocrlf=input' '
99
Junio C Hamano163b9592007-04-19 22:37:19 -0700100 rm -f tmp one dir/two three &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800101 git read-tree --reset -u HEAD &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800102 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800103
104 for f in one dir/two
105 do
106 append_cr <$f >tmp && mv -f tmp $f &&
107 git update-index -- $f || {
108 echo Oops
109 false
110 break
111 }
112 done &&
113
114 differs=`git diff-index --cached HEAD` &&
115 test -z "$differs" || {
116 echo Oops "$differs"
117 false
118 }
119
120'
121
122test_expect_success 'update with autocrlf=true' '
123
Junio C Hamano163b9592007-04-19 22:37:19 -0700124 rm -f tmp one dir/two three &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800125 git read-tree --reset -u HEAD &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800126 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800127
128 for f in one dir/two
129 do
130 append_cr <$f >tmp && mv -f tmp $f &&
131 git update-index -- $f || {
132 echo "Oops $f"
133 false
134 break
135 }
136 done &&
137
138 differs=`git diff-index --cached HEAD` &&
139 test -z "$differs" || {
140 echo Oops "$differs"
141 false
142 }
143
144'
145
146test_expect_success 'checkout with autocrlf=true' '
147
Junio C Hamano163b9592007-04-19 22:37:19 -0700148 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800149 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800150 git read-tree --reset -u HEAD &&
151
152 for f in one dir/two
153 do
Stephen Boydc4f3f552010-01-25 16:33:57 -0800154 remove_cr <"$f" >tmp && mv -f tmp $f &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800155 git update-index -- $f || {
156 echo "Eh? $f"
157 false
158 break
159 }
160 done &&
161 test "$one" = `git hash-object --stdin <one` &&
162 test "$two" = `git hash-object --stdin <dir/two` &&
163 differs=`git diff-index --cached HEAD` &&
164 test -z "$differs" || {
165 echo Oops "$differs"
166 false
167 }
168'
169
170test_expect_success 'checkout with autocrlf=input' '
171
Junio C Hamano163b9592007-04-19 22:37:19 -0700172 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800173 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800174 git read-tree --reset -u HEAD &&
175
176 for f in one dir/two
177 do
Stephen Boydc4f3f552010-01-25 16:33:57 -0800178 if has_cr "$f"
Junio C Hamano634ede32007-02-14 14:54:00 -0800179 then
180 echo "Eh? $f"
181 false
182 break
183 else
184 git update-index -- $f
185 fi
186 done &&
187 test "$one" = `git hash-object --stdin <one` &&
188 test "$two" = `git hash-object --stdin <dir/two` &&
189 differs=`git diff-index --cached HEAD` &&
190 test -z "$differs" || {
191 echo Oops "$differs"
192 false
193 }
194'
195
196test_expect_success 'apply patch (autocrlf=input)' '
197
Junio C Hamano163b9592007-04-19 22:37:19 -0700198 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800199 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800200 git read-tree --reset -u HEAD &&
201
202 git apply patch.file &&
203 test "$patched" = "`git hash-object --stdin <one`" || {
204 echo "Eh? apply without index"
205 false
206 }
207'
208
209test_expect_success 'apply patch --cached (autocrlf=input)' '
210
Junio C Hamano163b9592007-04-19 22:37:19 -0700211 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800212 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800213 git read-tree --reset -u HEAD &&
214
215 git apply --cached patch.file &&
216 test "$patched" = `git rev-parse :one` || {
217 echo "Eh? apply with --cached"
218 false
219 }
220'
221
222test_expect_success 'apply patch --index (autocrlf=input)' '
223
Junio C Hamano163b9592007-04-19 22:37:19 -0700224 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800225 git config core.autocrlf input &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800226 git read-tree --reset -u HEAD &&
227
228 git apply --index patch.file &&
229 test "$patched" = `git rev-parse :one` &&
230 test "$patched" = `git hash-object --stdin <one` || {
231 echo "Eh? apply with --index"
232 false
233 }
234'
235
236test_expect_success 'apply patch (autocrlf=true)' '
237
Junio C Hamano163b9592007-04-19 22:37:19 -0700238 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800239 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800240 git read-tree --reset -u HEAD &&
241
Junio C Hamano634ede32007-02-14 14:54:00 -0800242 git apply patch.file &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800243 test "$patched" = "`remove_cr <one | git hash-object --stdin`" || {
Junio C Hamano634ede32007-02-14 14:54:00 -0800244 echo "Eh? apply without index"
245 false
246 }
247'
248
249test_expect_success 'apply patch --cached (autocrlf=true)' '
250
Junio C Hamano163b9592007-04-19 22:37:19 -0700251 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800252 git config core.autocrlf true &&
Junio C Hamano634ede32007-02-14 14:54:00 -0800253 git read-tree --reset -u HEAD &&
254
255 git apply --cached patch.file &&
256 test "$patched" = `git rev-parse :one` || {
257 echo "Eh? apply without index"
258 false
259 }
260'
261
Junio C Hamano67160272007-02-17 12:37:25 -0800262test_expect_success 'apply patch --index (autocrlf=true)' '
263
Junio C Hamano163b9592007-04-19 22:37:19 -0700264 rm -f tmp one dir/two three &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800265 git config core.autocrlf true &&
Junio C Hamano67160272007-02-17 12:37:25 -0800266 git read-tree --reset -u HEAD &&
267
268 git apply --index patch.file &&
269 test "$patched" = `git rev-parse :one` &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800270 test "$patched" = "`remove_cr <one | git hash-object --stdin`" || {
Junio C Hamano67160272007-02-17 12:37:25 -0800271 echo "Eh? apply with --index"
272 false
273 }
274'
275
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700276test_expect_success '.gitattributes says two is binary' '
277
Junio C Hamano163b9592007-04-19 22:37:19 -0700278 rm -f tmp one dir/two three &&
Junio C Hamanoe4aee102007-04-15 14:56:09 -0700279 echo "two -crlf" >.gitattributes &&
Junio C Hamano5c66d0d2008-01-17 22:52:40 -0800280 git config core.autocrlf true &&
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700281 git read-tree --reset -u HEAD &&
282
Stephen Boydc4f3f552010-01-25 16:33:57 -0800283 if has_cr dir/two
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700284 then
285 echo "Huh?"
286 false
287 else
288 : happy
289 fi &&
290
Stephen Boydc4f3f552010-01-25 16:33:57 -0800291 if has_cr one
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700292 then
293 : happy
294 else
295 echo "Huh?"
296 false
Junio C Hamano163b9592007-04-19 22:37:19 -0700297 fi &&
298
Stephen Boydc4f3f552010-01-25 16:33:57 -0800299 if has_cr three
Junio C Hamano163b9592007-04-19 22:37:19 -0700300 then
301 echo "Huh?"
302 false
303 else
304 : happy
305 fi
306'
307
308test_expect_success '.gitattributes says two is input' '
309
310 rm -f tmp one dir/two three &&
311 echo "two crlf=input" >.gitattributes &&
312 git read-tree --reset -u HEAD &&
313
Stephen Boydc4f3f552010-01-25 16:33:57 -0800314 if has_cr dir/two
Junio C Hamano163b9592007-04-19 22:37:19 -0700315 then
316 echo "Huh?"
317 false
318 else
319 : happy
320 fi
321'
322
323test_expect_success '.gitattributes says two and three are text' '
324
325 rm -f tmp one dir/two three &&
326 echo "t* crlf" >.gitattributes &&
327 git read-tree --reset -u HEAD &&
328
Stephen Boydc4f3f552010-01-25 16:33:57 -0800329 if has_cr dir/two
Junio C Hamano163b9592007-04-19 22:37:19 -0700330 then
331 : happy
332 else
333 echo "Huh?"
334 false
335 fi &&
336
Stephen Boydc4f3f552010-01-25 16:33:57 -0800337 if has_cr three
Junio C Hamano163b9592007-04-19 22:37:19 -0700338 then
339 : happy
340 else
341 echo "Huh?"
342 false
Junio C Hamano35ebfd62007-04-12 22:30:05 -0700343 fi
344'
345
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700346test_expect_success 'in-tree .gitattributes (1)' '
347
348 echo "one -crlf" >>.gitattributes &&
349 git add .gitattributes &&
350 git commit -m "Add .gitattributes" &&
351
352 rm -rf tmp one dir .gitattributes patch.file three &&
353 git read-tree --reset -u HEAD &&
354
Stephen Boydc4f3f552010-01-25 16:33:57 -0800355 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700356 then
357 echo "Eh? one should not have CRLF"
358 false
359 else
360 : happy
361 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800362 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700363 echo "Eh? three should still have CRLF"
364 false
365 }
366'
367
368test_expect_success 'in-tree .gitattributes (2)' '
369
370 rm -rf tmp one dir .gitattributes patch.file three &&
371 git read-tree --reset HEAD &&
372 git checkout-index -f -q -u -a &&
373
Stephen Boydc4f3f552010-01-25 16:33:57 -0800374 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700375 then
376 echo "Eh? one should not have CRLF"
377 false
378 else
379 : happy
380 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800381 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700382 echo "Eh? three should still have CRLF"
383 false
384 }
385'
386
387test_expect_success 'in-tree .gitattributes (3)' '
388
389 rm -rf tmp one dir .gitattributes patch.file three &&
390 git read-tree --reset HEAD &&
391 git checkout-index -u .gitattributes &&
392 git checkout-index -u one dir/two three &&
393
Stephen Boydc4f3f552010-01-25 16:33:57 -0800394 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700395 then
396 echo "Eh? one should not have CRLF"
397 false
398 else
399 : happy
400 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800401 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700402 echo "Eh? three should still have CRLF"
403 false
404 }
405'
406
407test_expect_success 'in-tree .gitattributes (4)' '
408
409 rm -rf tmp one dir .gitattributes patch.file three &&
410 git read-tree --reset HEAD &&
411 git checkout-index -u one dir/two three &&
412 git checkout-index -u .gitattributes &&
413
Stephen Boydc4f3f552010-01-25 16:33:57 -0800414 if has_cr one
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700415 then
416 echo "Eh? one should not have CRLF"
417 false
418 else
419 : happy
420 fi &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800421 has_cr three || {
Junio C Hamano1a9d7e92007-08-14 01:41:02 -0700422 echo "Eh? three should still have CRLF"
423 false
424 }
425'
426
Kristian Amlieb9970452009-03-20 10:32:09 +0100427test_expect_success 'checkout with existing .gitattributes' '
428
429 git config core.autocrlf true &&
430 git config --unset core.safecrlf &&
431 echo ".file2 -crlfQ" | q_to_cr >> .gitattributes &&
432 git add .gitattributes &&
433 git commit -m initial &&
434 echo ".file -crlfQ" | q_to_cr >> .gitattributes &&
435 echo "contents" > .file &&
436 git add .gitattributes .file &&
437 git commit -m second &&
438
439 git checkout master~1 &&
440 git checkout master &&
441 test "$(git diff-files --raw)" = ""
442
443'
444
445test_expect_success 'checkout when deleting .gitattributes' '
446
447 git rm .gitattributes &&
448 echo "contentsQ" | q_to_cr > .file2 &&
449 git add .file2 &&
Jonathan Nieder2dec68c2010-10-31 02:30:58 -0500450 git commit -m third &&
Kristian Amlieb9970452009-03-20 10:32:09 +0100451
452 git checkout master~1 &&
453 git checkout master &&
Stephen Boydc4f3f552010-01-25 16:33:57 -0800454 has_cr .file2
Kristian Amlieb9970452009-03-20 10:32:09 +0100455
456'
457
Steffen Prohaskad7b0a092007-10-18 22:02:35 +0200458test_expect_success 'invalid .gitattributes (must not crash)' '
459
460 echo "three +crlf" >>.gitattributes &&
461 git diff
462
463'
Finn Arne Gangstadc4805392010-05-12 00:37:57 +0200464# Some more tests here to add new autocrlf functionality.
465# We want to have a known state here, so start a bit from scratch
466
467test_expect_success 'setting up for new autocrlf tests' '
468 git config core.autocrlf false &&
469 git config core.safecrlf false &&
470 rm -rf .????* * &&
471 for w in I am all LF; do echo $w; done >alllf &&
472 for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
473 for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
474 git add -A . &&
475 git commit -m "alllf, allcrlf and mixed only" &&
476 git tag -a -m "message" autocrlf-checkpoint
477'
478
479test_expect_success 'report no change after setting autocrlf' '
480 git config core.autocrlf true &&
481 touch * &&
482 git diff --exit-code
483'
484
485test_expect_success 'files are clean after checkout' '
486 rm * &&
487 git checkout -f &&
488 git diff --exit-code
489'
490
491cr_to_Q_no_NL () {
492 tr '\015' Q | tr -d '\012'
493}
494
495test_expect_success 'LF only file gets CRLF with autocrlf' '
496 test "$(cr_to_Q_no_NL < alllf)" = "IQamQallQLFQ"
497'
498
499test_expect_success 'Mixed file is still mixed with autocrlf' '
500 test "$(cr_to_Q_no_NL < mixed)" = "OhhereisCRLFQintext"
501'
502
503test_expect_success 'CRLF only file has CRLF with autocrlf' '
504 test "$(cr_to_Q_no_NL < allcrlf)" = "IQamQallQCRLFQ"
505'
506
507test_expect_success 'New CRLF file gets LF in repo' '
508 tr -d "\015" < alllf | append_cr > alllf2 &&
509 git add alllf2 &&
510 git commit -m "alllf2 added" &&
511 git config core.autocrlf false &&
512 rm * &&
513 git checkout -f &&
514 test_cmp alllf alllf2
515'
Steffen Prohaskad7b0a092007-10-18 22:02:35 +0200516
Junio C Hamano634ede32007-02-14 14:54:00 -0800517test_done