git - What is the difference between eol=lf and text in a .gitattributes file? -


according the documentation on .gitattributes, text enables end-of-line normalization:

text

setting text attribute on path enables end-of-line normalization , marks path text file. end-of-line conversion takes place without guessing content type.

according same documentation, eol=lf normalize linebreaks:

eol

this attribute sets specific line-ending style used in working directory. enables end-of-line normalization without content checks, setting text attribute.

the fact examples given mix them in same file seems imply there (perhaps subtle) difference between them:

*.txt       text *.vcproj    eol=crlf *.sh        eol=lf *.jpg       -text

also, there seems unambiguous statement same, or text shorthand eol=lf—though appears case. closest thing find such statement quoted above, says "effectively setting text attribute". word effectively seems back-pedal slightly, though it's not actually setting text attribute, more-or-less setting it, or having same effect.

what, precisely, difference between these two? (or text shorthand common use case?) there reason mix 2 in 1 .gitattributes file?

or: text require git guess kind of linebreak need, while eol (obviously) specifies?

eol tells git line endings use in working directory , also enables lf normalization files in repository. setting applies particular path, i'll use *.txt in examples:

  • *.txt eol=crlf tells git (1) normalize line endings lf on checkin , (2) convert them crlf when file checked out.
  • *.txt eol=lf tells git (1) normalize line endings lf on checkin , (2) prevent conversion crlf when file checked out.

notice both settings normalize line endings lf on checkin! sets text attribute because text same thing.

since these settings apply changes going forward, additional steps needed update files checked in.

and 1 more thing... careful set eol on paths matching text files. enables normalization without content checks, binary files should not normalized. depending on paths, might need explicitly exclude file types:

# disable eol normalization these types: *.png -text *.jpg -text *.ttf -text

Comments

Post a Comment

Popular posts from this blog

html - Outlook 2010 Anchor (url/address/link) -

i'm trying link specific pdf page msoutlook'10 or msword'10, #page=... anchor particularly useful , works fine elsewhere. unfortunately when click [ctr-k] in outlook or winword, links re-formatted assuming unc path. pdf file located on shared drive. using "file:" prefix links open pdf in adobe reader (outside of browser), , "http:" open inside browser. issue seem need open in browser "file:" prefix in order anchor work. know anchors work inside browser. outlook uses windows/explorer default program (based on file extension) seems open in adobe reader neglecting anchor. is aware of solution, link specific page or bookmark of shared-pdf ms outlook and/or winword link? common references: mailermailer.com/...anchor-tags-html-emails campaignmonitor.com/...anchor-links-in-email-newsletters/ stackoverflow.com/...anchor-in-pdf-document
Read more

javascript - Why does running this loop 9 times take 100x longer than running it 8 times? -

consider code: test = function() { } t = new test(); (var = 0; < 8; i++) { result = t instanceof test; } if change number of iterations 8 9 , loop take 100 times longer complete in latest version of firefox (41.0.1). tested on 2 different pcs , magic limit 8. here jsperf test used: http://jsperf.com/instanceof-8-times-vs-9-times does have idea why might happen? seems specific instanceof . not happen if else object, example check property. note: filed bugzilla bug this. jan de mooij mozilla team has posted details in bugzilla thread . here's simplistic interpretation of highly technical answers: in i < 8 case, firefox smart enough hoist result = t instanceof test; statement out of loop (according tests, doesn't seem omit altogether). in i < 9 case, apparently doesn't optimization . why? reason not clear, related fact 9 iterations threshold above function considered "hot" enough run through jit compiler. i < 8 cas...
Read more

Getting gateway time-out Rails app with Nginx + Puma running on Digital Ocean -

following this guide setup app on digital ocean droplet, not working. site not loading , it's throwing: "gateway time-out". the puma server works, since ps aux | grep puma prints: root 15878 0.0 0.4 376832 2168 ? sl 12:50 0:00 puma 2.13.4 (unix:///var/www/myapp/shared/tmp/sockets/myapp-puma.sock) [20150930164940] root 15881 0.0 0.7 903676 3692 ? sl 12:50 0:06 puma: cluster worker 0: 15878 [20150930164940] root 24654 0.0 0.1 11748 916 pts/2 s+ 18:00 0:00 grep --color=auto puma my nginx config: user root; worker_processes 1; events { worker_connections 1024; } http { upstream puma { server unix:///var/www/myapp/shared/tmp/sockets/myapp-puma.sock; } server { listen 80; server_name myapp.com; root /var/www/myapp/current/public; access_log /var/www/myapp/current/log/access.log; error_log /...
Read more