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

when locking hunks only consider commits from applied branches

Browse Source
This commit is contained in:
Kiril Videlov 2024-03-05 18:32:59 +01:00
parent 82f102e106
commit 99df783a0a
No known key found for this signature in database
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gitbutler-app/src/virtual_branches/virtual.rs
View File

@ -983,6 +983,7 @@ fn branches_with_hunk_locks(
let all_commits: Vec<VirtualBranchCommit> = branches let all_commits: Vec<VirtualBranchCommit> = branches
.clone() .clone()
.iter() .iter()
.filter(|branch| branch.active)
.flat_map(|vbranch| vbranch.commits.clone()) .flat_map(|vbranch| vbranch.commits.clone())
.collect(); .collect();