radicle: fix divergence check

The `graph_descendant_of` method is strict in that it will return false if the two `Oid`s are equal -- they are strictly not descendants. If the `head` is the same as the `canonical_oid`, no error should be returned and the `push` can happen without any issues. Add a check for `head != canonical_oid` before the `graph_descendant_check`. Signed-off-by: Fintan Halpenny <[email protected]> X-Clacks-Overhead: GNU Terry Pratchett
radicle-dev · Oct 5, 2023 · 499738d · 499738d
1 parent cd4c449
commit 499738d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/radicle-remote-helper/src/push.rs b/radicle-remote-helper/src/push.rs
@@ -230,7 +230,9 @@ pub fn run(
                             let head = working.find_reference(src.as_str())?;
                             let head = head.peel_to_commit()?.id();
 
-                            if !working.graph_descendant_of(head, **canonical_oid)? {
+                            if head != **canonical_oid
+                                && !working.graph_descendant_of(head, **canonical_oid)?
+                            {
                                 eprintln!(
                                     "hint: you are attempting to push a commit that would \
                                     cause your upstream to diverge from the canonical head"