Skip to content

Commit

Permalink
Merge branch 'archive-handling'
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Dec 12, 2023
2 parents 082655c + c8bef2c commit 7549559
Show file tree
Hide file tree
Showing 86 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**/generated-archives/*.tar.xz filter=lfs diff=lfs merge=lfs -text
**/generated-archives/*.tar.xz 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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ jobs:
if: startsWith(matrix.os, 'windows')
run: cargo check --all --bins --examples
- run: |
# it should never be a failure not to get the caches, as they can be regenerated.
git lfs fetch && git lfs checkout || true
- uses: taiki-e/install-action@v1
with:
Expand Down
1 change: 1 addition & 0 deletions crate-status.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ The top-level crate that acts as hub to all functionality provided by the `gix-*
* [ ] handle other non-discovery modes and provide control over environment variable usage required in applications
* [x] rev-parse
- [ ] handle relative paths as relative to working directory
- [ ] handle `upstream` and `push` resolution.
* [x] rev-walk
* [x] include tips
* [ ] exclude commits
Expand Down
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 modified gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz
Binary file not shown.
Binary file modified gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz
Binary file not shown.
1 change: 0 additions & 1 deletion gix-glob/tests/fixtures/generated-archives/.gitattributes

This file was deleted.

Binary file modified gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz
Binary file not shown.
Binary file modified gix-index/tests/fixtures/generated-archives/v2.tar.xz
Binary file not shown.
Binary file not shown.
Binary file modified gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz
Binary file not shown.
Binary file not shown.
Binary file modified gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz
Binary file not shown.
Binary file not shown.
Binary file modified gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions gix-pathspec/tests/fixtures/generated-archives/.gitattributes

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 modified gix-status/tests/fixtures/generated-archives/conflicts.tar.xz
Binary file not shown.
Binary file modified gix-status/tests/fixtures/generated-archives/racy_git.tar.xz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gix-status/tests/fixtures/generated-archives/status_removed.tar.xz
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file modified gix-traverse/tests/fixtures/generated-archives/make_repos.tar.xz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
basic.tar.xz

This file was deleted.

Binary file not shown.
2 changes: 0 additions & 2 deletions gix/tests/fixtures/generated-archives/.gitattributes

This file was deleted.

Binary file modified gix/tests/fixtures/generated-archives/make_am_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_basic_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_bisect_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar.xz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_config_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_config_repos.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_empty_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_head_repos.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_merge_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_packed_and_loose.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_references_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_remote_repo.tar.xz
Binary file not shown.
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_revert_repo.tar.xz
Binary file not shown.
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_shallow_repo.tar.xz
Binary file not shown.
Binary file modified gix/tests/fixtures/generated-archives/make_submodules.tar.xz
Binary file not shown.
4 changes: 4 additions & 0 deletions tests/tools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,10 @@ fn extract_archive(
)
})?;
if archive_identity != required_script_identity {
eprintln!(
"Ignoring archive at '{}' as its generating script changed",
archive.display()
);
return Err(std::io::ErrorKind::NotFound.into());
}

Expand Down

0 comments on commit 7549559

Please sign in to comment.