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_base.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 commitquery/query_merge_base.go (limited to 'commitquery/query_merge_base.go') diff --git a/commitquery/query_merge_base.go b/commitquery/query_merge_base.go new file mode 100644 index 00000000..e1ba3126 --- /dev/null +++ b/commitquery/query_merge_base.go @@ -0,0 +1,17 @@ +package commitquery + +import objectid "codeberg.org/lindenii/furgit/object/id" + +// MergeBase reports one merge base between left and right, if any. +func (query *query) MergeBase(left, right objectid.ObjectID) (objectid.ObjectID, bool, error) { + bases, err := query.MergeBases(left, right) + if err != nil { + return objectid.ObjectID{}, false, err + } + + if len(bases) == 0 { + return objectid.ObjectID{}, false, nil + } + + return bases[0], true, nil +} -- cgit v1.3.1-10-gc9f91