Merge pull request #1690 from EliahKagan/gitattributes

Byron · web-flow · commit 700cfa52e7f3 · 2024-11-19T07:26:53.000+01:00
Fix marking `gix-packetline-blocking` copy auto-generated
diff --git a/.gitattributes b/.gitattributes
@@ -1,11 +1,11 @@
 **/generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text
 
 # assure line feeds don't interfere with our working copy hash
-*.sh text crlf=input eol=lf
-justfile text crlf=input eol=lf
+*.sh text eol=lf
+justfile text eol=lf
 
 # have GitHub include fixture-making scripts when it counts code
-**/tests/fixtures/**/*.sh linguist-vendored=false
+**/tests/fixtures/**/*.sh -linguist-vendored
 
 # have GitHub treat the gix-packetline-blocking src copy as auto-generated
-gix-packetline-blocking/src/ linguist-generated=true
+/gix-packetline-blocking/src/**/* linguist-generated
diff --git a/gix-config/tests/.gitattributes b/gix-config/tests/.gitattributes
@@ -1,4 +1 @@
-# assure line feeds don't interfere with our working copy hash 
-/fixtures/**/* text eol=lf
 /fixtures/repo-config.crlf text eol=crlf
-
diff --git a/gix-config/tests/fixtures/fuzzed/.gitattributes b/gix-config/tests/fixtures/fuzzed/.gitattributes
@@ -1 +1 @@
-*.config -text -eof
+*.config -text
diff --git a/gix-object/tests/fixtures/.gitattributes b/gix-object/tests/fixtures/.gitattributes
@@ -1,2 +1,2 @@
 # assure newlines aren't butchered as they matter for testing
-**/*.txt text crlf=input   eol=lf
+*.txt text eol=lf
diff --git a/gix-protocol/tests/fixtures/.gitattributes b/gix-protocol/tests/fixtures/.gitattributes
@@ -1 +1 @@
-** -text
+* -text

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# assure newlines aren't butchered as they matter for testing`
`2`		`-*/.txt text crlf=input eol=lf`
	`2`	`+*.txt text eol=lf`