Skip to content

Set * text=auto in .gitattributes#77

Closed
jbj wants to merge 1 commit into
github:masterfrom
jbj:text-auto
Closed

Set * text=auto in .gitattributes#77
jbj wants to merge 1 commit into
github:masterfrom
jbj:text-auto

Conversation

@jbj

@jbj jbj commented Aug 20, 2018

Copy link
Copy Markdown
Contributor

Please review thoroughly as I've never tried this before. This change should ensure that all new text files get LF-style line endings in the repository and on future check-outs regardless of the platform.

See https://help.github.com/articles/dealing-with-line-endings/ and the articles linked from there.

I tested this by adding a new CRLF-style text file to the repo. When I did git add newfile.txt I got the following, which is what I expected:

warning: CRLF will be replaced by LF in newfile.txt.
The file will have its original line endings in your working directory.

I couldn't provoke git into converting an existing CRLF-style file into LF-style, and I don't know whether it's good or bad that they stay as they are until somebody explicitly converts them. We currently have 325 CRLF-style files in this repository.

This should ensure that all new text files get LF (Unix-style) line
endings in the repository and on future check-outs regardless of the
platform.

See https://help.github.com/articles/dealing-with-line-endings/ and the
articles linked from there.
@dave-bartolomeo

Copy link
Copy Markdown
Contributor

After talking to @rdmarsh2 (the other frequent Windows user within Semmle), we think we want the line endings in the working directory to be LF even on Windows, just so we're always working with files that are identical to what everybody on Linux and OSX are using. I've submitted PR #106 to do this. It's possible that setting * text=auto in .gitattributes is the right thing to do to handle anything not on the "LF-only" list, but I'm not sure yet.

@jbj

jbj commented Aug 27, 2018

Copy link
Copy Markdown
Contributor Author

Superseded by #106.

@jbj jbj closed this Aug 27, 2018
aibaars added a commit that referenced this pull request Oct 14, 2021
smowton pushed a commit to smowton/codeql that referenced this pull request Dec 6, 2021
Kotlin: Add more cases to the extractor
erik-krogh pushed a commit to erik-krogh/ql that referenced this pull request Dec 15, 2021
add pretty AST for YAML and a QLPack utility class
erik-krogh pushed a commit to erik-krogh/ql that referenced this pull request Dec 15, 2021
add pretty AST for YAML and a QLPack utility class
MathiasVP pushed a commit to MathiasVP/ql that referenced this pull request Aug 10, 2025
2.18.1 Upgrade Fix (DataFlowPrivate libraries)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants