trying things

Author: krlvi

Cargo.lock

@@ -73,6 +73,7 @@ but-rebase = { path = "crates/but-rebase" }
 but-core = { path = "crates/but-core" }
 but-workspace = { path = "crates/but-workspace" }
 but-hunk-dependency = { path = "crates/but-hunk-dependency" }
+but-debugging = { path = "crates/but-debugging" }
 
 [profile.release]
 codegen-units = 1 # Compile crates one after another so the compiler can optimize better

Cargo.toml

@@ -49,6 +49,7 @@ toml.workspace = true
 pretty_assertions = "1.4"
 gitbutler-testsupport.workspace = true
 gitbutler-workspace.workspace = true
+but-debugging.workspace = true
 gix = { workspace = true, features = [] }
 glob = "0.3.2"
 tempfile.workspace = true

crates/gitbutler-branch-actions/Cargo.toml

@@ -1778,6 +1778,8 @@ fn commit_partial_by_hunk() -> Result<()> {
     let list_result = internal::list_virtual_branches(ctx, guard.write_permission())?;
     let branches = list_result.branches;
     let branch = &branches.iter().find(|b| b.id == stack1_id).unwrap();
+    
+    but_debugging::git_log(ctx.repo().path(), but_debugging::LogOptions::default().all(true));
 
     assert_eq!(branch.files.len(), 1);
     assert_eq!(branch.files[0].hunks.len(), 2);
@@ -1857,14 +1859,16 @@ fn commit_partial_by_file() -> Result<()> {
     let list_result = internal::list_virtual_branches(ctx, guard.write_permission())?;
     let branches = list_result.branches;
     let branch1 = &branches.iter().find(|b| b.id == stack1_id).unwrap();
+    
+    but_debugging::git_log(ctx.repo().path(), but_debugging::LogOptions::default().all(true));
 
     // branch one test.txt has just the 1st and 3rd hunks applied
     let commit2 = &branch1.series[0].clone()?.patches[0].id;
     let commit2 = ctx
         .repo()
         .find_commit(commit2.to_owned())
         .expect("failed to get commit object");
-
+    
     let tree = commit1.tree().expect("failed to get tree");
     let file_list = tree_to_file_list(ctx.repo(), &tree);
     assert_eq!(file_list, vec!["test.txt", "test2.txt"]);

crates/gitbutler-branch-actions/tests/extra/mod.rs

@@ -317,13 +317,16 @@ impl Stack {
             .peel_to_commit()?
             .id;
         let mut revwalk = git2_repository.revwalk()?;
-        revwalk.hide(self.head(&gix_repo)?)?;
+        let head_oid = self.head(&gix_repo)?;
+        revwalk.hide(head_oid)?;
         revwalk.push(target_sha.to_git2())?;
         revwalk.simplify_first_parent()?;
-        let last_commit = revwalk.last().ok_or_else(|| anyhow!("fucked"))??;
-        let last_commit = git2_repository.find_commit(last_commit)?;
-        let merge_base = last_commit.parent_id(0)?;
-        Ok(merge_base)
+        if let Some(last) = revwalk.last() {
+            let commit = git2_repository.find_commit(last?)?;
+            Ok(commit.parent_id(0)?)
+        } else {
+            Ok(head_oid)
+        }
     }
 
     /// An initialized stack has at least one head (branch).

crates/gitbutler-stack/src/stack.rs

@@ -32,5 +32,6 @@ gitbutler-stack.workspace = true
 but-settings.workspace = true
 gitbutler-oxidize.workspace = true
 gitbutler-commit.workspace = true
+but-debugging.workspace = true
 termtree = "0.5.1"
 uuid.workspace = true

crates/gitbutler-testsupport/Cargo.toml

@@ -27,7 +27,9 @@ pub mod paths {
 
 pub mod virtual_branches {
     use gitbutler_command_context::CommandContext;
+    use gitbutler_oxidize::OidExt;
     use gitbutler_stack::{Target, VirtualBranchesHandle};
+    use gix::refs::transaction::PreviousValue;
 
     use crate::empty_bare_repository;
 
@@ -49,6 +51,13 @@ pub mod virtual_branches {
             })
             .expect("failed to write target");
 
+        ctx.gix_repository()?.reference(
+            "refs/remotes/origin/master".to_string(),
+            remote_repo.head().unwrap().target().unwrap().to_gix(),
+            PreviousValue::Any,
+            "",
+        )?;
+
         gitbutler_branch_actions::update_workspace_commit(&vb_state, ctx)
             .expect("failed to update workspace");