From 06583274fa64ad6677773bf4ca54f69226388203 Mon Sep 17 00:00:00 2001
From: Runxi Yu
Date: Sat, 28 Mar 2026 17:40:02 +0000
Subject: commitquery: Make a reusable engine thingy

---
 commitquery/queries_mergebase.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 commitquery/queries_mergebase.go

(limited to 'commitquery/queries_mergebase.go')

diff --git a/commitquery/queries_mergebase.go b/commitquery/queries_mergebase.go
new file mode 100644
index 00000000..ff0aafb9
--- /dev/null
+++ b/commitquery/queries_mergebase.go
@@ -0,0 +1,21 @@
+package commitquery
+
+import objectid "codeberg.org/lindenii/furgit/object/id"
+
+// MergeBases reports all merge bases in Git's merge-base --all order.
+//
+// Both inputs are peeled through annotated tags before commit traversal.
+func (queries *Queries) MergeBases(left, right objectid.ObjectID) ([]objectid.ObjectID, error) {
+	query := queries.acquire()
+	defer queries.release(query)
+
+	return query.MergeBases(left, right)
+}
+
+// MergeBase reports one merge base between left and right, if any.
+func (queries *Queries) MergeBase(left, right objectid.ObjectID) (objectid.ObjectID, bool, error) {
+	query := queries.acquire()
+	defer queries.release(query)
+
+	return query.MergeBase(left, right)
+}
-- 
cgit v1.3.1-10-gc9f91