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

avoids a gix panic with symbolic references

Browse Source
This commit is contained in:
Kiril Videlov 2024-07-24 23:29:57 +02:00
parent 10f7604670
commit 5147638d74
No known key found for this signature in database
GPG Key ID: A4C733025427C471
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/gitbutler-branch-actions/src/branch.rs
View File

@ -1,3 +1,4 @@
use std::any::TypeId;
use std::cmp::max;
use std::collections::HashMap;
use std::collections::HashSet;
@ -115,6 +116,7 @@ fn branch_group_to_branch(
reference.remote(gix::remote::Direction::Fetch).is_some()
|| reference.remote(gix::remote::Direction::Push).is_some()
})
.filter(|reference| matches!(reference.target(), gix::refs::TargetRef::Peeled(_)))
.collect();
let local_branches: Vec<&gix::Reference> = group_branches
.iter()
@ -126,6 +128,7 @@ fn branch_group_to_branch(
reference.remote(gix::remote::Direction::Fetch).is_none()
&& reference.remote(gix::remote::Direction::Push).is_none()
})
.filter(|reference| matches!(reference.target(), gix::refs::TargetRef::Peeled(_)))
.collect();
// Virtual branch associated with this branch
@ -150,9 +153,9 @@ fn branch_group_to_branch(
let head = if let Some(vbranch) = virtual_branch {
Some(vbranch.head)
} else if let Some(reference) = local_branches.first().cloned() {
Some(git2::Oid::from_bytes(reference.id().as_bytes())?)
Some(git2::Oid::from_bytes(reference.id().as_bytes())?) // We have filtered out symbolic references, which would otherwise panic
} else if let Some(reference) = remote_branches.first().cloned() {
Some(git2::Oid::from_bytes(reference.id().as_bytes())?)
Some(git2::Oid::from_bytes(reference.id().as_bytes())?) // We have filtered out symbolic references, which would otherwise panic
} else {
None
}