Re: [eclipse-dev] Planning Meeting Notes - September 28, 2011

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

Thanks for the detailed recommendation
BJ! We'll definitely talk this over at our next planning call and decide
if the same setup makes sense for the platform team.

John

BJ Hargrave <hargrave@xxxxxxxxxx>
Sent by: eclipse-dev-bounces@xxxxxxxxxxx

09/28/2011 01:48 PM

Please respond to
"General development mailing list of the Eclipse project."        <eclipse-dev@xxxxxxxxxxx>

To	"General development mailing list of the Eclipse project." <eclipse-dev@xxxxxxxxxxx>
cc
Subject	Re: [eclipse-dev] Planning Meeting Notes - September 28, 2011

Also, Windows users need to configure
another setting to avoid adding non-executable files to the repo with the
executable permission bits set. Using Windows file systems that don't properly
support Unix file permissions can cause issues with git "detecting"
changes in a file's permissions (or mode). The execute bit is impropertly
set. Set the config property core.fileMode to false after cloning the repository
to avoid this. 

git config core.fileMode false 

Once this option is set, if you do need to commit a change to the executable
bit on a file in the repository, you will need to use the command:

git update-index --chmod=(+|-)x path 

with the appropriate + or - to set or clear the executable bit. For a new
file, you will need to git add the file before using the above command.

--

BJ Hargrave Senior Technical Staff Member, IBM OSGi Fellow and CTO of the OSGi Alliance hargrave@xxxxxxxxxx

office: +1 386 848 1781 mobile: +1 386 848 3788

From:        BJ
Hargrave/Austin/IBM@IBMUS 
To:        "General
development mailing list of the Eclipse project." <eclipse-dev@xxxxxxxxxxx>,
Date:        2011/09/28
12:08 
Subject:        Re:
[eclipse-dev] Planning Meeting Notes - September 28, 2011
Sent by:        eclipse-dev-bounces@xxxxxxxxxxx

---

> - How to deal with line delimiters in Git? 
> In CVS, the default was to have ASCII files converted on checkout
> and commit. The repo only contained LF. 
> In Git, the core.autocrlf option is false by default, which means
> that new files from Windows machines are checked in unchanged with
> CRLFs. To keep the repo "clean" (with only LFs), we should
either 
> set project-specific line delimiters for new files to UNIX or set
> core.autocrlf=true. Does anybody have experience with autocrlf? Does
> it work in EGit? 

First solution is to ban all Windows users :-) Given that this is unrealistic,
here is what we do in OSGi. 

We tell Windows users to set core.autocrlf=false. Setting it to true is
problematic. The ideal is to have the files have LF line endings all the
time. In the repo and in each user's workspace. Setting core.autocrlf=true
will cause git to convert files to crlf on checkout so they are no longer
the same as what is in the repo. You are also at the mercy of what git
thinks is a text file and should be converted to crlf.

There is also core.eol=lf: "This setting forces git to normalize line
endings to LF on checkin and prevents conversion to CRLF when the file
is checked out." This setting was added in git 1.7.2 but some users
may be using older versions of git. You also must mark which files are
"text" in the .gitattributes file. Since you need to mark file
patterns as text in .gitattributes anyway, you can also set the eol setting
in the same place. In OSGi, we use the older crlf=input setting which is
equivalent to the newer eol=lf setting in .gitattributes (but works with
pre-1.7.2 git). Either will mark the file pattern as text file as well
as specify the EOL treatment. Setting this in the .gitattributes file which
is committed to the repo means you are not at risk of the user forgetting
to git config core.eol=lf in their local repo.

So, in summary, users must set core.autocrlf=false and each repo needs
a .gitattributes file to control the desired line ending state for the
text files in the repo. Here is the .gitattributes we use at OSGi.

# Text files with LF eol 
*.auth crlf=input 
*.awk crlf=input 
*.bnd crlf=input 
*.c crlf=input ident 
*.conf crlf=input 
*.cpp crlf=input ident 
*.css crlf=input 
*.ddf crlf=input 
*.ee crlf=input 
*.groovy crlf=input 
*.h crlf=input ident 
*.html crlf=input ident 
*.java crlf=input ident 
*.js crlf=input 
*.lib crlf=input 
*.MF crlf=input 
*.perm crlf=input 
*.php crlf=input 
*.pl crlf=input 
*.prefs crlf=input 
*.properties crlf=input 
*.py crlf=input 
*.schema crlf=input 
*.sh crlf=input 
*.tcl crlf=input 
*.txt crlf=input 
*.xml crlf=input 
*.xsd crlf=input ident 
*.xsl crlf=input 
*.xslt crlf=input 
.classpath crlf=input 
.project crlf=input 
packageinfo crlf=input 
Makefile crlf=input 

# No EOL translation 
*.bat -crlf 

# Binary. No EOL translation, no diff 
*.ico binary 
*.jpeg binary 
*.jpg binary 
*.png binary 
*.crt binary 
*.pdf binary 
*.dll binary 
*.jar binary 
*.jnilib binary 
*.so binary 
*.zip binary 
*.doc binary 
*.ppt binary 
*.xls binary 
*.odg binary 
*.odp binary 
*.ods binary 
*.odt binary 
*.otg binary 
*.otp binary 
*.ots binary 
*.ott binary 
*.key binary 
*.numbers binary 
*.pages binary _______________________________________________
eclipse-dev mailing list
eclipse-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe
from this list, visit
https://dev.eclipse.org/mailman/listinfo/eclipse-dev
_______________________________________________
eclipse-dev mailing list
eclipse-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe
from this list, visit
https://dev.eclipse.org/mailman/listinfo/eclipse-dev