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

fix: handle case when branch is not found in delete_branch function

Browse Source
This commit is contained in:
Nikita Galaiko 2023-12-12 14:43:37 +01:00 committed by GitButler
parent 0d667c1fa3
commit f5331b4c1e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/tauri/src/virtual_branches/virtual.rs
View File

@ -1357,9 +1357,12 @@ pub fn delete_branch(
let branch_reader = branch::Reader::new(&current_session_reader);
let branch_writer = branch::Writer::new(gb_repository);
let branch = branch_reader
.read(branch_id)
.context("failed to read branch")?;
let branch = match branch_reader.read(branch_id) {
Ok(branch) => Ok(branch),
Err(reader::Error::NotFound) => return Ok(()),
Err(error) => Err(error),
}
.context("failed to read branch")?;
if branch.applied && unapply_branch(gb_repository, project_repository, branch_id)?.is_none() {
return Ok(());