Merge pull request #4463 from gitbutlerapp/get-workspace-head-return-…

…early-when-nothign-applied

get_workspace_head exit early when there are no applied branches

crates/gitbutler-branch-actions/src/integration.rs

@@ -40,9 +40,20 @@ pub(crate) fn get_workspace_head(project_repo: &ProjectRepository) -> Result<git
 
     let mut virtual_branches: Vec<Branch> = vb_state.list_branches_in_workspace()?;
 
+    let branch_heads = virtual_branches
+        .iter()
+        .map(|b| repo.find_commit(b.head))
+        .collect::<Result<Vec<_>, _>>()?;
+    let branch_head_refs = branch_heads.iter().collect::<Vec<_>>();
+
     let target_commit = repo.find_commit(target.sha)?;
     let mut workspace_tree = target_commit.tree()?;
 
+    // If no branches are applied then the workspace head is the target.
+    if branch_head_refs.is_empty() {
+        return Ok(target_commit.id());
+    }
+
     if conflicts::is_conflicting(project_repo, None)? {
         let merge_parent =
             conflicts::merge_parent(project_repo)?.ok_or(anyhow!("No merge parent"))?;
@@ -68,17 +79,6 @@ pub(crate) fn get_workspace_head(project_repo: &ProjectRepository) -> Result<git
         }
     }
 
-    let branch_heads = virtual_branches
-        .iter()
-        .map(|b| repo.find_commit(b.head))
-        .collect::<Result<Vec<_>, _>>()?;
-    let branch_head_refs = branch_heads.iter().collect::<Vec<_>>();
-
-    // If no branches are applied then the workspace head is the target.
-    if branch_head_refs.is_empty() {
-        return Ok(target_commit.id());
-    }
-
     // TODO(mg): Can we make this a constant?
     let committer = get_integration_commiter()?;