Safe checkout for the oplog

That way it shouldn't lose untracked files anymore

Author: Byron

Cargo.lock

@@ -26,6 +26,7 @@ gitbutler-fs.workspace = true
 gitbutler-reference.workspace = true
 gitbutler-stack.workspace = true
 but-core.workspace = true
+but-workspace.workspace = true
 
 [[test]]
 name = "oplog"

crates/gitbutler-oplog/Cargo.toml

@@ -619,11 +619,19 @@ fn restore_snapshot(
     repo.ignore_large_files_in_diffs(AUTO_TRACK_LIMIT_BYTES)?;
 
     // Define the checkout builder
-    let mut checkout_builder = git2::build::CheckoutBuilder::new();
-    checkout_builder.remove_untracked(true);
-    checkout_builder.force();
-    // Checkout the tree
-    repo.checkout_tree(workdir_tree.as_object(), Some(&mut checkout_builder))?;
+    if ctx.app_settings().feature_flags.cv3 {
+        but_workspace::branch::safe_checkout_from_head(
+            workdir_tree.id().to_gix(),
+            &gix_repo,
+            but_workspace::branch::checkout::Options::default(),
+        )?;
+    } else {
+        let mut checkout_builder = git2::build::CheckoutBuilder::new();
+        checkout_builder.remove_untracked(true);
+        checkout_builder.force();
+        // Checkout the tree
+        repo.checkout_tree(workdir_tree.as_object(), Some(&mut checkout_builder))?;
+    }
 
     // Update virtual_branches.toml with the state from the snapshot
     fs::write(

crates/gitbutler-oplog/src/oplog.rs

@@ -65,12 +65,12 @@ pub fn update_uncommited_changes_with_tree(
     ctx: &CommandContext,
     old: WorkspaceState,
     new: WorkspaceState,
-    old_uncommited_changes: Option<git2::Oid>,
+    old_uncommitted_changes: Option<git2::Oid>,
     always_checkout: Option<bool>,
     _perm: &mut WorktreeWritePermission,
 ) -> Result<()> {
     let repo = ctx.repo();
-    if let Some(worktree_id) = old_uncommited_changes {
+    if let Some(worktree_id) = old_uncommitted_changes {
         let mut new_uncommited_changes = move_tree_between_workspaces(repo, worktree_id, old, new)?;
 
         // If the new tree and old tree are the same, then we don't need to do anything
@@ -91,9 +91,11 @@ pub fn update_uncommited_changes_with_tree(
             ),
         )?;
     } else {
+        let old_tree_id = merge_workspace(repo, old)?.to_gix();
         let new_tree_id = merge_workspace(repo, new)?.to_gix();
         let gix_repo = ctx.gix_repo_for_merging()?;
-        but_workspace::branch::safe_checkout_from_head(
+        but_workspace::branch::safe_checkout(
+            old_tree_id,
             new_tree_id,
             &gix_repo,
             but_workspace::branch::checkout::Options::default(),