fix(pull): local rebase detected as ammendments

also updated copy and code comments

1 files changed, 13 insertions, 0 deletions

diff --git a/src/git.rs b/src/git.rs
index 6edca0f..41d68c7 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -68,6 +68,7 @@ pub trait RepoActions {
         patch_and_ancestors: Vec<nostr::Event>,
     ) -> Result<Vec<nostr::Event>>;
     fn parse_starting_commits(&self, starting_commits: &str) -> Result<Vec<Sha1Hash>>;
+    fn ancestor_of(&self, decendant: &Sha1Hash, ancestor: &Sha1Hash) -> Result<bool>;
 }
 
 impl RepoActions for Repo {
@@ -461,6 +462,18 @@ impl RepoActions for Repo {
             bail!("specified value not in a supported format")
         }
     }
+
+    fn ancestor_of(&self, decendant: &Sha1Hash, ancestor: &Sha1Hash) -> Result<bool> {
+        if let Ok(res) = self
+            .git_repo
+            .graph_descendant_of(sha1_to_oid(decendant)?, sha1_to_oid(ancestor)?)
+            .context("could not run graph_descendant_of in gitlib2")
+        {
+            Ok(res)
+        } else {
+            Ok(false)
+        }
+    }
 }
 
 fn oid_to_u8_20_bytes(oid: &Oid) -> [u8; 20] {