mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve error message for identity error

This commit is contained in:
Alexis Sellier 2023-01-30 12:38:59 +01:00
parent 0726c553da
commit 99bd62d276
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicle/src/storage/git.rs
View File

@ -63,8 +63,8 @@ impl<'a> TryFrom<git2::Reference<'a>> for Ref {
pub enum ProjectError { pub enum ProjectError {
#[error("identity branches diverge from each other")] #[error("identity branches diverge from each other")]
BranchesDiverge, BranchesDiverge,
#[error("identity branches are in an invalid state")] #[error("identity branches missing")]
InvalidState, MissingHeads,
#[error("storage error: {0}")] #[error("storage error: {0}")]
Storage(#[from] Error), Storage(#[from] Error),
#[error("identity document error: {0}")] #[error("identity document error: {0}")]
@ -304,7 +304,7 @@ impl Repository {
heads.push(oid.into()); heads.push(oid.into());
} }
// Keep track of the longest identity branch. // Keep track of the longest identity branch.
let mut longest = heads.pop().ok_or(ProjectError::InvalidState)?; let mut longest = heads.pop().ok_or(ProjectError::MissingHeads)?;
for head in &heads { for head in &heads {
let base = self.raw().merge_base(*head, longest)?; let base = self.raw().merge_base(*head, longest)?;