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

Better filter branches to unapply in case of conflicts

Browse Source
This commit is contained in:
Caleb Owens 2024-07-03 14:57:18 +02:00
commit 2d0dc3a9ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3343,7 +3343,7 @@ pub fn create_virtual_branch_from_branch(
.0 .0
.into_iter() .into_iter()
.map(|(branch, _)| branch) .map(|(branch, _)| branch)
.filter(|branch| branch.applied) .filter(|branch| branch.id != branch_id)
{ {
convert_to_real_branch(project_repository, branch.id, Default::default())?; convert_to_real_branch(project_repository, branch.id, Default::default())?;
} }