ecca50a treewide: Avoid `git2::Oid::zero` — heartwood

rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5

Radicle Heartwood Protocol & Stack

treewide: Avoid `git2::Oid::zero`

Lorenz Leutgeb committed 2 days ago

commit ecca50a5f90279880c8d80987bacba66a0569ec9
parent f651753

4 files changed +9 -10

modified crates/radicle-cli/src/commands/watch.rs

@@ -42,7 +42,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {

             thread::sleep(interval);
             let oid = reference(&repo, &nid, &qualified)?;
             if oid != initial {
                 term::info!("{}", oid.unwrap_or(git::raw::Oid::zero().into()));
                 term::info!("{}", oid.unwrap_or(git::Oid::ZERO_SHA1));
                 break;
             }
             if now.elapsed()? >= timeout {

modified crates/radicle-fetch/src/git/mem.rs

@@ -42,10 +42,10 @@ impl Refdb {

             .fold(Applied::default(), |mut ap, update| match update {
                 Update::Direct { name, target, .. } => {
                     let name = name.into_qualified().into_owned();
                     let prev = match self.0.insert(name.clone(), target) {
                         Some(prev) => prev,
                         None => radicle::git::raw::Oid::zero().into(),
                     };
                     let prev = self
                         .0
                         .insert(name.clone(), target)
                         .unwrap_or(radicle::git::Oid::ZERO_SHA1);
                     ap.updated.push(RefUpdate::Updated {
                         name: name.to_ref_string(),
                         old: prev,

modified crates/radicle-protocol/src/service/message.rs

@@ -690,7 +690,6 @@ mod tests {

     use fastrand;
     use localtime::LocalTime;
     use qcheck_macros::quickcheck;
     use radicle::git::raw;
     use radicle::test::arbitrary;
     use crate::wire::Decode as _;

@@ -701,7 +700,7 @@ mod tests {

     fn test_ref_remote_limit() {
         let mut refs = BoundedVec::<_, REF_REMOTE_LIMIT>::new();
         let signer = Device::mock();
         let at = raw::Oid::zero().into();
         let at = git::Oid::ZERO_SHA1;
         assert_eq!(refs.capacity(), REF_REMOTE_LIMIT);

@@ -759,7 +758,7 @@ mod tests {

     fn prop_refs_announcement_signing(rid: RepoId) {
         let signer = Device::mock_rng(&mut fastrand::Rng::new());
         let timestamp = Timestamp::EPOCH;
         let at = raw::Oid::zero().into();
         let at = git::Oid::ZERO_SHA1;
         let refs = BoundedVec::collect_from(
             &mut [RefsAt {
                 remote: *signer.public_key(),

modified crates/radicle/src/node/notifications/store.rs

@@ -380,7 +380,7 @@ mod parse {

                     })
                 })
             })
             .unwrap_or(Ok(git::raw::Oid::zero().into()))?;
             .unwrap_or(Ok(git::Oid::ZERO_SHA1))?;
         let new = row
             .try_read::<Option<&str>, _>("new")?
             .map(|oid| {

@@ -391,7 +391,7 @@ mod parse {

                     })
                 })
             })
             .unwrap_or(Ok(git::raw::Oid::zero().into()))?;
             .unwrap_or(Ok(git::Oid::ZERO_SHA1))?;
         let update = RefUpdate::from(RefString::try_from(refstr)?, old, new);
         let (namespace, qualified) = git::parse_ref(refstr)?;
         let timestamp = row.try_read::<i64, _>("timestamp")?;