Skip to content

Commit c64d02d

Browse files
committed
Undo .gitattributes formatting, move LFS entry
1 parent a834101 commit c64d02d

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

.gitattributes

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
# git add --renormalize .
66
# git status [just to show what files were renormalized]
77
# git commit -m "Normalize line endings"
8+
89
# Anything Git auto-detects as text gets normalized and checked out as LF
910
* text=auto eol=lf
11+
1012
# Explicitly set a bunch of known extensions to text, in case auto detection gets confused.
1113
*.ql text
1214
*.qll text
@@ -38,6 +40,7 @@
3840
*.lua text
3941
*.expected text
4042
*.go text
43+
4144
# Explicitly set a bunch of known extensions to binary, because Git < 2.10 will treat
4245
# `* text=auto eol=lf` as `* text eol=lf`
4346
*.png -text
@@ -46,27 +49,33 @@
4649
*.gif -text
4750
*.dll -text
4851
*.pdb -text
52+
4953
java/ql/test/stubs/**/*.java linguist-generated=true
5054
java/ql/test/experimental/stubs/**/*.java linguist-generated=true
55+
/java/kotlin-extractor/deps/*.jar filter=lfs diff=lfs merge=lfs -text
56+
5157
# Force git not to modify line endings for go or html files under the go/ql directory
5258
go/ql/**/*.go -text
5359
go/ql/**/*.html -text
5460
# Force git not to modify line endings for go dbschemes
5561
go/*.dbscheme -text
5662
# Preserve unusual line ending from codeql-go merge
5763
go/extractor/opencsv/CSVReader.java -text
64+
5865
# For some languages, upgrade script testing references really old dbscheme
5966
# files from legacy upgrades that have CRLF line endings. Since upgrade
6067
# resolution relies on object hashes, we must suppress line ending conversion
6168
# for those testing dbscheme files.
6269
*/ql/lib/upgrades/initial/*.dbscheme -text
70+
6371
# Generated test files - these are synced from the standard JavaScript libraries using
6472
# `javascript/ql/experimental/adaptivethreatmodeling/test/update_endpoint_test_files.py`.
6573
javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.js linguist-generated=true -merge
6674
javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.ts linguist-generated=true -merge
75+
6776
# Auto-generated modeling for Python
6877
python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml linguist-generated=true
78+
6979
# auto-generated bazel lock file
7080
ruby/extractor/cargo-bazel-lock.json linguist-generated=true
7181
ruby/extractor/cargo-bazel-lock.json -merge
72-
/java/kotlin-extractor/deps/*.jar filter=lfs diff=lfs merge=lfs -text

0 commit comments

Comments
 (0)