diff --git a/crates/radicle-fetch/src/state.rs b/crates/radicle-fetch/src/state.rs index bc2367e7..9de9d0d5 100644 --- a/crates/radicle-fetch/src/state.rs +++ b/crates/radicle-fetch/src/state.rs @@ -742,6 +742,7 @@ where if let Some(signed_oid) = signed.remove(&refname) { if oid != signed_oid { validations.push(Validation::MismatchedRef { + remote: remote.id(), refname, expected: signed_oid, actual: oid, diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs index 7809fb15..0a9af664 100644 --- a/crates/radicle/src/storage/git.rs +++ b/crates/radicle/src/storage/git.rs @@ -377,11 +377,12 @@ impl DerefMut for Validations { pub enum Validation { #[error("found unsigned ref `{0}`")] UnsignedRef(RefString), - #[error("{refname}: expected {expected}, but found {actual}")] + #[error("expected `refs/namespaces/{remote}/{refname}` at {expected} but found {actual}")] MismatchedRef { + remote: RemoteId, + refname: RefString, expected: Oid, actual: Oid, - refname: RefString, }, #[error("missing `refs/namespaces/{remote}/{refname}`")] MissingRef { @@ -648,6 +649,7 @@ impl ValidateRepository for Repository { if let Some(signed_oid) = signed.remove(&refname) { if oid != signed_oid { failures.push(Validation::MismatchedRef { + remote: remote.id(), refname, expected: signed_oid, actual: oid,