Skip to content

Commit

Permalink
See if get_workspace_head() fixes E2E
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Aug 28, 2024
1 parent c86300b commit c44d090
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/gitbutler-branch-actions/src/status.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{collections::HashMap, path::PathBuf, vec};

use crate::integration::get_workspace_head;
use crate::{
conflicts::RepoConflictsExt,
file::{virtual_hunks_into_virtual_files, VirtualBranchFile},
Expand All @@ -16,7 +17,6 @@ use gitbutler_command_context::CommandContext;
use gitbutler_diff::{diff_files_into_hunks, GitHunk, Hunk, HunkHash};
use gitbutler_operating_modes::assure_open_workspace_mode;
use gitbutler_project::access::WorktreeWritePermission;
use gitbutler_repo::RepositoryExt;
use tracing::instrument;

/// Represents the uncommitted status of the applied virtual branches in the workspace.
Expand Down Expand Up @@ -51,7 +51,7 @@ pub fn get_applied_status_cached(
// calculate which should already be 'fixed' - why do we have the integration branch
// if we can't assume it's in the right state? So ideally, we assure that the code
// that affects the integration branch also updates it?
let integration_commit_id = ctx.repository().head_commit()?.id();
let integration_commit_id = get_workspace_head(ctx)?;
let mut virtual_branches = ctx
.project()
.virtual_branches()
Expand Down

0 comments on commit c44d090

Please sign in to comment.