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/merge_bases.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'commitquery/merge_bases.go')

diff --git a/commitquery/merge_bases.go b/commitquery/merge_bases.go
index 0e410709..281906f3 100644
--- a/commitquery/merge_bases.go
+++ b/commitquery/merge_bases.go
@@ -9,7 +9,7 @@ import (
 // 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) {
+func (query *query) MergeBases(left, right objectid.ObjectID) ([]objectid.ObjectID, error) {
 	leftIdx, err := query.resolveCommitish(left)
 	if err != nil {
 		return nil, err
@@ -45,7 +45,7 @@ func (query *Query) MergeBases(left, right objectid.ObjectID) ([]objectid.Object
 }
 
 // MergeBase reports one merge base between left and right, if any.
-func (query *Query) MergeBase(left, right objectid.ObjectID) (objectid.ObjectID, bool, error) {
+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
@@ -58,7 +58,7 @@ func (query *Query) MergeBase(left, right objectid.ObjectID) (objectid.ObjectID,
 	return bases[0], true, nil
 }
 
-func (query *Query) mergeBases(left, right nodeIndex) ([]nodeIndex, error) {
+func (query *query) mergeBases(left, right nodeIndex) ([]nodeIndex, error) {
 	if left == right {
 		return []nodeIndex{left}, nil
 	}
-- 
cgit v1.3.1-10-gc9f91