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

Merge pull request #4011 from gitbutlerapp/reimplement-hunk-locking-code-1

Browse Source 
Filter out unapplied branches
This commit is contained in:
Caleb Owens 2024-06-05 22:34:36 +02:00 committed by GitHub
commit 68a2293ae6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -1612,6 +1612,7 @@ fn new_compute_locks(
let branch_path_diffs = virtual_branches let branch_path_diffs = virtual_branches
.iter() .iter()
.filter(|branch| branch.applied)
.filter_map(|branch| { .filter_map(|branch| {
let commit = repository.find_commit(branch.head.into()).ok()?; let commit = repository.find_commit(branch.head.into()).ok()?;
let tree = commit.tree().ok()?; let tree = commit.tree().ok()?;