Skip to content

Commit

Permalink
Merge pull request #1690 from EliahKagan/gitattributes
Browse files Browse the repository at this point in the history
Fix marking `gix-packetline-blocking` copy auto-generated
  • Loading branch information
Byron authored Nov 19, 2024
2 parents b06f729 + 325588e commit 700cfa5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions gix-config/tests/.gitattributes
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion gix-config/tests/fixtures/fuzzed/.gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.config -text -eof
*.config -text
2 changes: 1 addition & 1 deletion gix-object/tests/fixtures/.gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# assure newlines aren't butchered as they matter for testing
**/*.txt text crlf=input eol=lf
*.txt text eol=lf
2 changes: 1 addition & 1 deletion gix-protocol/tests/fixtures/.gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
** -text
* -text

0 comments on commit 700cfa5

Please sign in to comment.