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 65c95a1566d03437f39535ace2310793074f93e8
parent 02141428b077dc001e3a743f1662ae15b760499a
1 failed (1 total) View logs
1 file changed +5 -2
modified crates/radicle-remote-helper/src/push.rs
@@ -679,8 +679,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);
    }