Skip to content

Commit 19d46f3

Browse files
committed
No need to isolate archives by crate name (#384)
1 parent 4f5b1fd commit 19d46f3

File tree

56 files changed

+75
-101
lines changed

Some content is hidden

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

56 files changed

+75
-101
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
**/generated-archives/*/*.tar.xz filter=lfs diff=lfs merge=lfs -text
1+
**/generated-archives/*.tar.xz filter=lfs diff=lfs merge=lfs -text

git-commitgraph/tests/fixtures/generated-archives/git-commitgraph/octopus_merges.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-commitgraph/tests/fixtures/generated-archives/git-commitgraph/single_commit.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-commitgraph/tests/fixtures/generated-archives/git-commitgraph/single_parent.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-commitgraph/tests/fixtures/generated-archives/git-commitgraph/two_parents.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:fdb7b214315cabdf81173aed5530c2030d3d4f5f2888ebc194f6d1268fca685a
3+
size 11028
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:0ab0225258e6ecdb30ee1d47927213660f8efde4268219a667a387aa295e5d1b
3+
size 9824
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:88d09648935a3eb359d846c279f0917f34d115781836830442dc105dd43c9056
3+
size 10064
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:c7db665d1e857933e030d6b34384a30a7a3ccb7af557ccbba7e2e304632e97a6
3+
size 10272

git-diff/tests/fixtures/generated-archives/git-diff/make_diff_repo.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:9b4140a06af5353cd0436b59b74fc724b546b176ce110ac73c9843fe45bba2f5
3+
size 17148

git-glob/tests/fixtures/generated-archives/git-glob/make_baseline.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:cdade0fe7f3df3ac737130a101b077c82f9de1dcb3d59d5964e5ffd920405e8d
3+
size 10384

git-index/tests/fixtures/generated-archives/git-index/V2_empty.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-index/tests/fixtures/generated-archives/git-index/v2.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-index/tests/fixtures/generated-archives/git-index/v2_more_files.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-index/tests/fixtures/generated-archives/git-index/v2_split_index.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-index/tests/fixtures/generated-archives/git-index/v4_more_files_IEOT.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-odb/tests/fixtures/generated-archives/git-odb/make_replaced_history.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-odb/tests/fixtures/generated-archives/git-odb/make_repo_multi_index.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:276948e1907264f7c8a6bed007b6564afc891d3d517511d4b04be4154d1c4c60
3+
size 11828
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:9b7c838e9bc586515b7bcbb2acdd3fbad294a080041a3e99fbe472159eb97478
3+
size 78172

git-pack/tests/fixtures/generated-archives/git-pack/make_pack_gen_repo.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-pack/tests/fixtures/generated-archives/git-pack/make_pack_gen_repo_multi_index.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_namespaced_packed_ref_repository.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_packed_ref_repository.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_packed_ref_repository_for_overlay.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_packed_refs_for_lookup_rules.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_ref_repository.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_repo_for_reflog.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-ref/tests/fixtures/generated-archives/git-ref/make_repository_with_lots_of_packed_refs.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:7e73ea6b1b302661b6c4b5fb501ba7e01331c43015f501b07af04c506f60ea11
3+
size 10152
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:62e893d53d97cb3433794fe477bea35565bfc4e79d83745738aea1c5c8c38f3b
3+
size 10104
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:8f0c0d8b8866caee2797bee55e680cefbdc1da876a0f43e265e5210fb2d3dd27
3+
size 10236
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:c1b0692e59d4becf37a2a757bd5202400b994109e57d2ee80a73a3453590d236
3+
size 9960
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:768f57b6f862a14c1dd079c056380cb6e2cbc67800d47dd67fc5fecbb3e6e039
3+
size 10132
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:e7fe369e2c7a87e2688c6d0bf3bcdbe3e31754266f39f53a390f85551ba8258e
3+
size 10848
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:028a4429060e064bf25bf86c2d21a9458a29c4b36ad8c3d873b84581730db6f7
3+
size 51500

git-repository/tests/fixtures/generated-archives/git-repository/make_basic_repo.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-repository/tests/fixtures/generated-archives/git-repository/make_references_repo.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-repository/tests/fixtures/generated-archives/git-repository/make_repo_with_fork_and_dates.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:fa8dd6cb3d43e72355fa16be84330c3581278c6f4c952a5397ee63f2a1ff8b1d
3+
size 10540
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:62e893d53d97cb3433794fe477bea35565bfc4e79d83745738aea1c5c8c38f3b
3+
size 10104
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:91b1dd658c06390db23c8aa1fbf4942c83ed31e05eab07e0f7596c94a8a8fc07
3+
size 10496

git-revision/tests/fixtures/generated-archives/git-revision/make_repo_with_branches.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:7cbbe5397b29025aa128d607b2484e91c971355b45e2b723d4a98094e0cb96d6
3+
size 12504

git-traverse/tests/fixtures/generated-archives/git-traverse/make_traversal_repo_for_commits.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-traverse/tests/fixtures/generated-archives/git-traverse/make_traversal_repo_for_commits_with_dates.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-traverse/tests/fixtures/generated-archives/git-traverse/make_traversal_repo_for_trees.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:b27ea2072a10e4d86f848575b30e308cefd02d07c8add95904013f9759adf256
3+
size 11304
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:91b1dd658c06390db23c8aa1fbf4942c83ed31e05eab07e0f7596c94a8a8fc07
3+
size 10496
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:098e2999295361685f0d55442ba48f7592d6c6532b050da4e73455db89738fa8
3+
size 10436

git-worktree/tests/fixtures/generated-archives/git-worktree/make_dangerous_symlink.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-worktree/tests/fixtures/generated-archives/git-worktree/make_ignorecase_collisions.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

git-worktree/tests/fixtures/generated-archives/git-worktree/make_mixed_without_submodules.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/tools/src/lib.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ pub fn scripted_fixture_repo_read_only_with_args(
109109

110110
let script_basename = script_location.file_stem().unwrap_or(script_location.as_os_str());
111111
let archive_file_path = fixture_path(
112-
Path::new("generated-archives")
113-
.join(crate_under_test())
114-
.join(format!("{}.tar.xz", script_basename.to_str().expect("valid UTF-8"))),
112+
Path::new("generated-archives").join(format!("{}.tar.xz", script_basename.to_str().expect("valid UTF-8"))),
115113
);
116114
let script_result_directory = fixture_path(
117115
Path::new("generated-do-not-edit")
@@ -137,7 +135,13 @@ pub fn scripted_fixture_repo_read_only_with_args(
137135
}
138136
Err(err) => {
139137
if err.kind() != std::io::ErrorKind::NotFound {
140-
eprintln!("{}", err);
138+
eprintln!("failed to extract '{}': {}", archive_file_path.display(), err);
139+
} else {
140+
eprintln!(
141+
"Archive at '{}' not found, creating fixture using script '{}'",
142+
archive_file_path.display(),
143+
script_location.display()
144+
);
141145
}
142146
let script_absolute_path = std::env::current_dir()?.join(script_path);
143147
let output = std::process::Command::new("bash")

0 commit comments

Comments
 (0)