Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
remote-helper: Check base when matching revisions
✗ CI failure Lorenz Leutgeb committed 7 months ago
commit 5caa7b302a7d4f247aaa7cc688a692aac4486464
parent 9bb136105c587bde745036d858b6150d15cfe8c7
2 failed (2 total) View logs
1 file changed +5 -2
modified crates/radicle-remote-helper/src/push.rs
@@ -692,8 +692,11 @@ where

    let base = patch_base(head, &opts, stored)?;

-
    // Don't update patch if it already has a revision matching this commit.
-
    if patch.revisions().any(|(_, r)| r.head() == *head) {
+
    // Don't update patch if it already has a matching revision.
+
    if patch
+
        .revisions()
+
        .any(|(_, r)| r.head() == *head && *r.base() == base)
+
    {
        return Ok(None);
    }