File tree 9 files changed +12
-16
lines changed
src/remote/connection/fetch/update_refs
fixtures/generated-archives
fixtures/generated-archives
gix-ref/tests/fixtures/generated-archives
9 files changed +12
-16
lines changed Original file line number Diff line number Diff line change @@ -253,17 +253,8 @@ mod changes {
253
253
":100644 100644 28ce6a8b26aa170e1de65536fe8abe1832bd3242 13c2aca72ab576cb5f22dc8e7f8ba8ddab553a8a M f/f"
254
254
) ;
255
255
256
- #[ cfg( windows) ]
257
- let tree_with_link_id = hex_to_id ( "3b287f8730c81d0b763c2d294618a5e32b67b4f8" ) ;
258
- #[ cfg( windows) ]
259
- let link_entry_oid = hex_to_id ( "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391" ) ;
260
- #[ cfg( windows) ]
261
- let link_entry_mode = EntryKind :: Blob ;
262
- #[ cfg( not( windows) ) ]
263
256
let tree_with_link_id = hex_to_id ( "7e26dba59b6336f87d1d4ae3505a2da302b91c76" ) ;
264
- #[ cfg( not( windows) ) ]
265
257
let link_entry_oid = hex_to_id ( "2e65efe2a145dda7ee51d1741299f848e5bf752e" ) ;
266
- #[ cfg( not( windows) ) ]
267
258
let link_entry_mode = EntryKind :: Link ;
268
259
assert_eq ! (
269
260
diff_with_previous_commit_from( & db, & all_commits[ "f/f mode changed to link" ] ) ?,
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ mod baseline {
11
11
if cfg ! ( windows) {
12
12
exe = exe. replace ( '\\' , "/" ) ;
13
13
}
14
- gix_testtools:: scripted_fixture_read_only_with_args ( "baseline.sh" , [ exe] ) ?;
14
+ gix_testtools:: scripted_fixture_read_only_with_args_single_archive ( "baseline.sh" , [ exe] ) ?;
15
15
Ok ( ( ) )
16
16
}
17
17
}
Original file line number Diff line number Diff line change 1
1
make_worktree_repo.tar
2
+ make_worktree_repo_packed.tar
Original file line number Diff line number Diff line change @@ -25,16 +25,19 @@ mod update {
25
25
}
26
26
27
27
fn repo ( name : & str ) -> gix:: Repository {
28
- let dir =
29
- gix_testtools:: scripted_fixture_read_only_with_args ( "make_fetch_repos.sh" , [ base_repo_path ( ) ] ) . unwrap ( ) ;
28
+ let dir = gix_testtools:: scripted_fixture_read_only_with_args_single_archive (
29
+ "make_fetch_repos.sh" ,
30
+ [ base_repo_path ( ) ] ,
31
+ )
32
+ . unwrap ( ) ;
30
33
gix:: open_opts ( dir. join ( name) , restricted ( ) ) . unwrap ( )
31
34
}
32
35
fn named_repo ( name : & str ) -> gix:: Repository {
33
36
let dir = gix_testtools:: scripted_fixture_read_only ( "make_remote_repos.sh" ) . unwrap ( ) ;
34
37
gix:: open_opts ( dir. join ( name) , restricted ( ) ) . unwrap ( )
35
38
}
36
39
fn repo_rw ( name : & str ) -> ( gix:: Repository , gix_testtools:: tempfile:: TempDir ) {
37
- let dir = gix_testtools:: scripted_fixture_writable_with_args (
40
+ let dir = gix_testtools:: scripted_fixture_writable_with_args_single_archive (
38
41
"make_fetch_repos.sh" ,
39
42
[ base_repo_path ( ) ] ,
40
43
gix_testtools:: Creation :: ExecuteScript ,
@@ -189,7 +192,7 @@ mod update {
189
192
190
193
#[ test]
191
194
fn checked_out_branches_in_worktrees_are_rejected_with_additional_information ( ) -> Result {
192
- let root = gix_path:: realpath ( gix_testtools:: scripted_fixture_read_only_with_args (
195
+ let root = gix_path:: realpath ( gix_testtools:: scripted_fixture_read_only_with_args_single_archive (
193
196
"make_fetch_repos.sh" ,
194
197
[ base_repo_path ( ) ] ,
195
198
) ?) ?;
Original file line number Diff line number Diff line change 1
1
/make_worktree_repo.tar
2
+ /make_worktree_repo_bare.tar
2
3
/make_worktree_repo_with_configs.tar
3
4
/make_remote_repos.tar
4
5
/make_complex_shallow_repo.tar
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ mod blocking_and_async_io {
63
63
args : impl IntoIterator < Item = S > ,
64
64
mode : Mode ,
65
65
) -> Result < ( gix:: Repository , gix_testtools:: tempfile:: TempDir ) , gix:: open:: Error > {
66
- let dir = gix_testtools:: scripted_fixture_writable_with_args (
66
+ let dir = gix_testtools:: scripted_fixture_writable_with_args_single_archive (
67
67
"make_fetch_repos.sh" ,
68
68
[ {
69
69
let mut url = base_repo_path ( ) ;
Original file line number Diff line number Diff line change @@ -72,7 +72,7 @@ mod traverse {
72
72
#[ parallel]
73
73
fn complex_graphs_can_be_iterated_despite_multiple_shallow_boundaries ( ) -> crate :: Result {
74
74
let base = gix_path:: realpath ( gix_testtools:: scripted_fixture_read_only ( "make_remote_repos.sh" ) ?. join ( "base" ) ) ?;
75
- let shallow_base = gix_testtools:: scripted_fixture_read_only_with_args (
75
+ let shallow_base = gix_testtools:: scripted_fixture_read_only_with_args_single_archive (
76
76
"make_complex_shallow_repo.sh" ,
77
77
Some ( base. to_string_lossy ( ) ) ,
78
78
) ?;
You can’t perform that action at this time.
0 commit comments