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

move snapshot DeleteBranch to before the operation

Browse Source
This commit is contained in:
Kiril Videlov 2024-05-23 11:12:33 +02:00
parent 4e234d6b5c
commit 7bd3548030
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1453,11 +1453,11 @@ pub fn delete_branch(
Err(error) => Err(error),
}
.context("failed to read branch")?;
_ = project_repository
.project()
.snapshot_branch_deletion(branch.name.clone());
if branch.applied && unapply_branch(project_repository, branch_id)?.is_none() {
_ = project_repository
.project()
.snapshot_branch_deletion(branch.name);
return Ok(());
}
@ -1469,9 +1469,6 @@ pub fn delete_branch(
ensure_selected_for_changes(&vb_state).context("failed to ensure selected for changes")?;
_ = project_repository
.project()
.snapshot_branch_deletion(branch.name);
Ok(())
}