From a403510a24a803bcab5d35d8d5843f0ac9203726 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Tue, 24 Sep 2024 16:42:29 -0400 Subject: [PATCH] Revert "simplify .gitattributes" This reverts commit dd94f57db82a9bf5833e290b3300a747001bb1eb. One of the changes to `.gitattributes`, possibly that change, has caused the currently committed generated archives not to be able to be used, producing Windows `test-fast` failures similar to #1358. See comments in #1607 for details. --- .gitattributes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index f307bd391f2..8602f1fb954 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,11 @@ -generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text +**/generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text # assure line feeds don't interfere with our working copy hash -tests/fixtures/**/*.sh text crlf=input eol=lf +**/tests/fixtures/**/*.sh text crlf=input eol=lf /justfile text crlf=input eol=lf # have GitHub include fixture-making scripts when it counts code -tests/fixtures/**/*.sh linguist-vendored=false +**/tests/fixtures/**/*.sh linguist-vendored=false # have GitHub treat the gix-packetline-blocking src copy as auto-generated gix-packetline-blocking/src/ linguist-generated=true