Showing the changes to git-worktree (1 of 4 files). Show all
Unified · Split
| @@ -270,7 +270,7 @@ fn allow_or_disallow_symlinks() -> crate::Result { · 269 unmodified lines | |||
| 270 | fn keep_going_collects_results() { | 270 | fn keep_going_collects_results() { |
| 271 | let mut opts = opts_from_probe(); | 271 | let mut opts = opts_from_probe(); |
| 272 | opts.keep_going = true; | 272 | opts.keep_going = true; |
| 273 | let mut count = AtomicUsize::default(); | 273 | let count = AtomicUsize::default(); |
| 274 | let (_source_tree, destination, _index, outcome) = checkout_index_in_tmp_dir_opts( | 274 | let (_source_tree, destination, _index, outcome) = checkout_index_in_tmp_dir_opts( |
| 275 | opts, | 275 | opts, |
| 276 | "make_mixed_without_submodules", | 276 | "make_mixed_without_submodules", |
| @@ -454,10 +454,7 @@ fn checkout_index_in_tmp_dir_opts( · 177 unmodified lines | |||
| 454 | let source_tree = fixture_path(name); | 454 | let source_tree = fixture_path(name); |
| 455 | let git_dir = source_tree.join(".git"); | 455 | let git_dir = source_tree.join(".git"); |
| 456 | let mut index = git_index::File::at(git_dir.join("index"), Default::default())?; | 456 | let mut index = git_index::File::at(git_dir.join("index"), Default::default())?; |
| 457 | let odb = git_odb::at(git_dir.join("objects"))? | 457 | let odb = git_odb::at(git_dir.join("objects"))?.into_inner().into_arc()?; |
| 458 | .into_inner() | ||
| 459 | .into_arc() | ||
| 460 | .to_cache_arc(); | ||
| 461 | let destination = tempfile::tempdir_in(std::env::current_dir()?)?; | 458 | let destination = tempfile::tempdir_in(std::env::current_dir()?)?; |
| 462 | prep_dest(destination.path())?; | 459 | prep_dest(destination.path())?; |
| 463 | 460 | ||