From 04d70f27d854803b3f49c9715749e5338370cfef Mon Sep 17 00:00:00 2001
From: cloudhead <cloudhead@radicle.xyz>
Date: Fri, 1 Sep 2023 12:21:00 +0200
Subject: [PATCH] remote-helper: Fix issue with legacy patches

Legacy (or broken) patches prevented merge operations from happening.
---
 radicle-remote-helper/src/push.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/radicle-remote-helper/src/push.rs b/radicle-remote-helper/src/push.rs
index b1ab6e69..9740bd74 100644
--- a/radicle-remote-helper/src/push.rs
+++ b/radicle-remote-helper/src/push.rs
@@ -460,7 +460,10 @@ fn patch_merge_all<G: Signer>(
 
     let mut patches = patch::Patches::open(stored)?;
     for patch in patches.all()? {
-        let (id, patch) = patch?;
+        let Ok((id, patch)) = patch else {
+            // Skip patches that failed to load.
+            continue;
+        };
         let (revision_id, revision) = patch.latest();
 
         if patch.is_open() && commits.contains(&revision.head()) {