Skip to content

Commit c44d090

Browse files
committed
See if get_workspace_head() fixes E2E
1 parent c86300b commit c44d090

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::{collections::HashMap, path::PathBuf, vec};
22

3+
use crate::integration::get_workspace_head;
34
use crate::{
45
conflicts::RepoConflictsExt,
56
file::{virtual_hunks_into_virtual_files, VirtualBranchFile},
@@ -16,7 +17,6 @@ use gitbutler_command_context::CommandContext;
1617
use gitbutler_diff::{diff_files_into_hunks, GitHunk, Hunk, HunkHash};
1718
use gitbutler_operating_modes::assure_open_workspace_mode;
1819
use gitbutler_project::access::WorktreeWritePermission;
19-
use gitbutler_repo::RepositoryExt;
2020
use tracing::instrument;
2121

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

0 commit comments

Comments
 (0)