Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gitbutlerapp/gitbutler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c44d09055119b00d448485086047f5aac843907b
Choose a base ref
..
head repository: gitbutlerapp/gitbutler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c86300b13a80be962c3a022db4771ba1434970e7
Choose a head ref
Showing with 2 additions and 2 deletions.
  1. +2 −2 crates/gitbutler-branch-actions/src/status.rs
4 changes: 2 additions & 2 deletions crates/gitbutler-branch-actions/src/status.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::{collections::HashMap, path::PathBuf, vec};

use crate::integration::get_workspace_head;
use crate::{
conflicts::RepoConflictsExt,
file::{virtual_hunks_into_virtual_files, VirtualBranchFile},
@@ -17,6 +16,7 @@ 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.
@@ -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 = get_workspace_head(ctx)?;
let integration_commit_id = ctx.repository().head_commit()?.id();
let mut virtual_branches = ctx
.project()
.virtual_branches()