From b36cabb39632719b0769f46a08cb1ff09320c013 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Fri, 12 Apr 2024 16:04:15 +0200 Subject: [PATCH] Anchor `.gitattributes` entries at root where it makes sense --- .gitattributes | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitattributes b/.gitattributes index a3550843103..8ec5fa04659 100644 --- a/.gitattributes +++ b/.gitattributes @@ -50,32 +50,32 @@ *.dll -text *.pdb -text -java/ql/test/stubs/**/*.java linguist-generated=true -java/ql/test/experimental/stubs/**/*.java linguist-generated=true +/java/ql/test/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 -go/ql/**/*.go -text -go/ql/**/*.html -text +/go/ql/**/*.go -text +/go/ql/**/*.html -text # Force git not to modify line endings for go dbschemes -go/*.dbscheme -text +/go/*.dbscheme -text # 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 # files from legacy upgrades that have CRLF line endings. Since upgrade # resolution relies on object hashes, we must suppress line ending conversion # 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 # `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/**/*.ts 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 # 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 -ruby/extractor/cargo-bazel-lock.json linguist-generated=true -ruby/extractor/cargo-bazel-lock.json -merge +/ruby/extractor/cargo-bazel-lock.json linguist-generated=true +/ruby/extractor/cargo-bazel-lock.json -merge