From 354fa416f983a8a3f9256b4a1f29d7a907656c50 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz.leutgeb@radicle.dev>
Date: Sun, 26 Apr 2026 01:39:17 +0200
Subject: [PATCH] =?UTF-8?q?git2:=200.20=20=E2=86=92=200.21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                       | 9 ++++-----
 Cargo.toml                       | 2 +-
 radicle-git-ext/src/blob.rs      | 5 +++--
 radicle-git-ext/src/commit.rs    | 5 ++++-
 radicle-git-ext/t/src/gen/urn.rs | 2 +-
 radicle-surf/src/fs.rs           | 5 ++++-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8ca2e2d..bba4f39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -294,15 +294,14 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.20.4"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
+checksum = "ddddbf932745a6be37109b6112d3ee09696106f848449069d3a57bba937ab82e"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
  "libgit2-sys",
  "log",
- "url",
 ]
 
 [[package]]
@@ -485,9 +484,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.18.3+1.9.2"
+version = "0.18.4+1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487"
+checksum = "9b26f66f35e1871b22efcf7191564123d2a446ca0538cde63c23adfefa9b15b7"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index e4449c2..a1e8da0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,4 +23,4 @@ repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9r
 rust-version = "1.78.0"
 
 [workspace.dependencies]
-git2 = { version = "0.20", default-features = false, features = ["vendored-libgit2"] }
\ No newline at end of file
+git2 = { version = "0.21", default-features = false, features = ["vendored-libgit2"] }
diff --git a/radicle-git-ext/src/blob.rs b/radicle-git-ext/src/blob.rs
index 4e23b5d..85d57e4 100644
--- a/radicle-git-ext/src/blob.rs
+++ b/radicle-git-ext/src/blob.rs
@@ -92,8 +92,9 @@ impl<'a> Blob<'a> {
                     Branch::Ref(reference) => {
                         match (reference.target(), reference.symbolic_target()) {
                             (Some(oid), _) => Ok(revwalk::Start::Oid(oid)),
-                            (_, Some(sym)) => Ok(revwalk::Start::Ref(sym.to_string())),
-                            (_, _) => Err(Error::NotFound(NotFound::NoRefTarget)),
+                            (_, Ok(Some(sym))) => Ok(revwalk::Start::Ref(sym.to_string())),
+                            (_, Ok(None)) => Err(Error::NotFound(NotFound::NoRefTarget)),
+                            (_, Err(err)) => Err(Error::Git(err)),
                         }
                     }
                 }?;
diff --git a/radicle-git-ext/src/commit.rs b/radicle-git-ext/src/commit.rs
index 2a670bd..99b8866 100644
--- a/radicle-git-ext/src/commit.rs
+++ b/radicle-git-ext/src/commit.rs
@@ -276,7 +276,10 @@ impl TryFrom<git2::Buf> for Commit {
     type Error = error::Parse;
 
     fn try_from(value: git2::Buf) -> Result<Self, Self::Error> {
-        value.as_str().ok_or(error::Parse::InvalidFormat)?.parse()
+        value
+            .as_str()
+            .map_err(|_| error::Parse::InvalidFormat)?
+            .parse()
     }
 }
 
diff --git a/radicle-git-ext/t/src/gen/urn.rs b/radicle-git-ext/t/src/gen/urn.rs
index 15ab338..376d304 100644
--- a/radicle-git-ext/t/src/gen/urn.rs
+++ b/radicle-git-ext/t/src/gen/urn.rs
@@ -12,5 +12,5 @@ pub fn gen_oid(kind: git2::ObjectType) -> impl Strategy<Value = Oid> {
 /// of the type indicated in parameter `kind` or a zeroed `Oid` with
 /// equal probability
 pub fn gen_oid_with_zero(kind: git2::ObjectType) -> impl Strategy<Value = Oid> {
-    prop_oneof![gen_oid(kind), Just(git2::Oid::zero().into()),]
+    prop_oneof![gen_oid(kind), Just(git2::Oid::ZERO_SHA1.into()),]
 }
diff --git a/radicle-surf/src/fs.rs b/radicle-surf/src/fs.rs
index 9ceec21..2cbdf8f 100644
--- a/radicle-surf/src/fs.rs
+++ b/radicle-surf/src/fs.rs
@@ -269,7 +269,10 @@ impl Entry {
         path: PathBuf,
         repo: &Repository,
     ) -> Result<Self, error::Directory> {
-        let name = entry.name().ok_or(error::Directory::Utf8Error)?.to_string();
+        let name = entry
+            .name()
+            .map_err(|_| error::Directory::Utf8Error)?
+            .to_string();
         let id = entry.id().into();
 
         match entry.kind() {