apps/servers/octopus: implementing octopus merge parsing

1 files changed, 7 insertions, 0 deletions

diff --git a/apps/servers/octopus/supergit/src/commit.rs b/apps/servers/octopus/supergit/src/commit.rs
index dc8c18a0c98b..41c827f64d82 100644
--- a/apps/servers/octopus/supergit/src/commit.rs
+++ b/apps/servers/octopus/supergit/src/commit.rs
@@ -51,6 +51,13 @@ impl Commit {
             .and_then(|c| Self::new(&self.repo, c.id().into()))
     }
 
+    pub fn parents(&self) -> Vec<Commit> {
+        self.find()
+            .parents()
+            .map(|c| Self::new(&self.repo, c.id().into()).unwrap())
+            .collect()
+    }
+
     fn find(&self) -> git2::Commit {
         self.repo.find_commit(self.id.to_oid()).unwrap()
     }