gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-29 20:43:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4618 from gitbutlerapp/Use-better-comparison-point-for-real-branches

Browse Source 
feat: Update merge base comparison for branch listing
This commit is contained in:
Caleb Owens 2024-08-06 13:32:36 +02:00 committed by GitHub
commit 22762745e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/gitbutler-branch-actions/src/branch.rs
View File

@ -430,8 +430,23 @@ pub fn get_branch_listing_details(
.get_default_target()
.context("failed to get default target")?;
let mut enriched_branches = Vec::new();
let default_local_branch =
repo.find_branch(default_target.branch.branch(), git2::BranchType::Local)?;
let default_branch = default_local_branch.upstream()?;
let head_commit = default_branch.get().peel_to_commit()?;
for branch in branches {
if let Ok(base) = repo.merge_base(default_target.sha, branch.head) {
let merge_base_comparison = if let Some(virtual_branch) = branch.virtual_branch {
if virtual_branch.in_workspace {
default_target.sha
} else {
head_commit.id()
}
} else {
head_commit.id()
};
if let Ok(base) = repo.merge_base(merge_base_comparison, branch.head) {
let base_tree = repo.find_commit(base)?.tree()?;
let head_tree = repo.find_commit(branch.head)?.tree()?;
let diff_stats = repo