Undo .gitattributes formatting, move LFS entry

This commit is contained in:
Paolo Tranquilli
2024-04-12 10:44:18 +02:00
parent a834101d7e
commit c64d02d6df

11
.gitattributes vendored
View File

@@ -5,8 +5,10 @@
# git add --renormalize . # git add --renormalize .
# git status [just to show what files were renormalized] # git status [just to show what files were renormalized]
# git commit -m "Normalize line endings" # git commit -m "Normalize line endings"
# Anything Git auto-detects as text gets normalized and checked out as LF # Anything Git auto-detects as text gets normalized and checked out as LF
* text=auto eol=lf * text=auto eol=lf
# Explicitly set a bunch of known extensions to text, in case auto detection gets confused. # Explicitly set a bunch of known extensions to text, in case auto detection gets confused.
*.ql text *.ql text
*.qll text *.qll text
@@ -38,6 +40,7 @@
*.lua text *.lua text
*.expected text *.expected text
*.go text *.go text
# Explicitly set a bunch of known extensions to binary, because Git < 2.10 will treat # Explicitly set a bunch of known extensions to binary, because Git < 2.10 will treat
# `* text=auto eol=lf` as `* text eol=lf` # `* text=auto eol=lf` as `* text eol=lf`
*.png -text *.png -text
@@ -46,8 +49,11 @@
*.gif -text *.gif -text
*.dll -text *.dll -text
*.pdb -text *.pdb -text
java/ql/test/stubs/**/*.java linguist-generated=true java/ql/test/stubs/**/*.java linguist-generated=true
java/ql/test/experimental/stubs/**/*.java linguist-generated=true java/ql/test/experimental/stubs/**/*.java linguist-generated=true
/java/kotlin-extractor/deps/*.jar filter=lfs diff=lfs merge=lfs -text
# Force git not to modify line endings for go or html files under the go/ql directory # Force git not to modify line endings for go or html files under the go/ql directory
go/ql/**/*.go -text go/ql/**/*.go -text
go/ql/**/*.html -text go/ql/**/*.html -text
@@ -55,18 +61,21 @@ go/ql/**/*.html -text
go/*.dbscheme -text go/*.dbscheme -text
# Preserve unusual line ending from codeql-go merge # Preserve unusual line ending from codeql-go merge
go/extractor/opencsv/CSVReader.java -text go/extractor/opencsv/CSVReader.java -text
# For some languages, upgrade script testing references really old dbscheme # For some languages, upgrade script testing references really old dbscheme
# files from legacy upgrades that have CRLF line endings. Since upgrade # files from legacy upgrades that have CRLF line endings. Since upgrade
# resolution relies on object hashes, we must suppress line ending conversion # resolution relies on object hashes, we must suppress line ending conversion
# for those testing dbscheme files. # for those testing dbscheme files.
*/ql/lib/upgrades/initial/*.dbscheme -text */ql/lib/upgrades/initial/*.dbscheme -text
# Generated test files - these are synced from the standard JavaScript libraries using # Generated test files - these are synced from the standard JavaScript libraries using
# `javascript/ql/experimental/adaptivethreatmodeling/test/update_endpoint_test_files.py`. # `javascript/ql/experimental/adaptivethreatmodeling/test/update_endpoint_test_files.py`.
javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.js linguist-generated=true -merge javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.js linguist-generated=true -merge
javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.ts linguist-generated=true -merge javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.ts linguist-generated=true -merge
# Auto-generated modeling for Python # Auto-generated modeling for Python
python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml linguist-generated=true python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml linguist-generated=true
# auto-generated bazel lock file # auto-generated bazel lock file
ruby/extractor/cargo-bazel-lock.json linguist-generated=true ruby/extractor/cargo-bazel-lock.json linguist-generated=true
ruby/extractor/cargo-bazel-lock.json -merge ruby/extractor/cargo-bazel-lock.json -merge
/java/kotlin-extractor/deps/*.jar filter=lfs diff=lfs merge=lfs -text