From df73a4c6f1b58075316ba7449fbfb127b9fbb79d Mon Sep 17 00:00:00 2001
From: Runxi Yu
Date: Sun, 29 Mar 2026 14:42:13 +0000
Subject: commitquery: Reorganize

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

(limited to 'commitquery/query_merge_bases.go')

diff --git a/commitquery/query_merge_bases.go b/commitquery/query_merge_bases.go
new file mode 100644
index 00000000..384ee019
--- /dev/null
+++ b/commitquery/query_merge_bases.go
@@ -0,0 +1,45 @@
+package commitquery
+
+import (
+	"slices"
+
+	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 (query *query) MergeBases(left, right objectid.ObjectID) ([]objectid.ObjectID, error) {
+	leftIdx, err := query.resolveCommitish(left)
+	if err != nil {
+		return nil, err
+	}
+
+	rightIdx, err := query.resolveCommitish(right)
+	if err != nil {
+		return nil, err
+	}
+
+	candidates, err := query.mergeBases(leftIdx, rightIdx)
+	if err != nil {
+		return nil, err
+	}
+
+	slices.SortFunc(candidates, func(left, right nodeIndex) int {
+		switch {
+		case query.commitTime(left) > query.commitTime(right):
+			return -1
+		case query.commitTime(left) < query.commitTime(right):
+			return 1
+		default:
+			return objectid.Compare(query.id(left), query.id(right))
+		}
+	})
+
+	out := make([]objectid.ObjectID, 0, len(candidates))
+	for _, idx := range candidates {
+		out = append(out, query.id(idx))
+	}
+
+	return out, nil
+}
-- 
cgit v1.3.1-10-gc9f91