Skip to content

Commit 7549559

Browse files
committed
Merge branch 'archive-handling'
2 parents 082655c + c8bef2c commit 7549559

File tree

86 files changed

+8
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+8
-11
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
**/generated-archives/*.tar.xz filter=lfs diff=lfs merge=lfs -text
1+
**/generated-archives/*.tar.xz filter=lfs-disabled diff=lfs merge=lfs -text
22

33
# assure line feeds don't interfere with our working copy hash
44
**/tests/fixtures/**/*.sh text crlf=input eol=lf

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ jobs:
8080
if: startsWith(matrix.os, 'windows')
8181
run: cargo check --all --bins --examples
8282
- run: |
83+
# it should never be a failure not to get the caches, as they can be regenerated.
8384
git lfs fetch && git lfs checkout || true
8485
- uses: taiki-e/install-action@v1
8586
with:

crate-status.md

+1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

gix-glob/tests/fixtures/generated-archives/.gitattributes

-1
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

gix-object/tests/fixtures/generated-archives/.gitattributes

-1
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

gix-pathspec/tests/fixtures/generated-archives/.gitattributes

-2
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

gix-submodule/tests/fixtures/generated-archives/.gitattributes

-1
This file was deleted.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
basic.tar.xz

gix-worktree-stream/tests/fixtures/generated-archives/basic.tar.xz

-3
This file was deleted.
Binary file not shown.

gix/tests/fixtures/generated-archives/.gitattributes

-2
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

tests/tools/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,10 @@ fn extract_archive(
676676
)
677677
})?;
678678
if archive_identity != required_script_identity {
679+
eprintln!(
680+
"Ignoring archive at '{}' as its generating script changed",
681+
archive.display()
682+
);
679683
return Err(std::io::ErrorKind::NotFound.into());
680684
}
681685

0 commit comments

Comments
 (0)