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

remote-helper: Fix issue with legacy patches 

Legacy (or broken) patches prevented merge operations from happening.
This commit is contained in:
cloudhead 2023-09-01 12:21:00 +02:00
parent 9cf20ddef9
commit 04d70f27d8
No known key found for this signature in database
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
radicle-remote-helper/src/push.rs
View File

@ -460,7 +460,10 @@ fn patch_merge_all<G: Signer>(
let mut patches = patch::Patches::open(stored)?; let mut patches = patch::Patches::open(stored)?;
for patch in patches.all()? { 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(); let (revision_id, revision) = patch.latest();
if patch.is_open() && commits.contains(&revision.head()) { if patch.is_open() && commits.contains(&revision.head()) {