aboutsummaryrefslogtreecommitdiff
path: root/commitquery/merge_bases.go
diff options
context:
space:
mode:
authorGravatar Runxi Yu2026-03-28 17:40:02 +0000
committerGravatar Runxi Yu2026-03-28 17:40:02 +0000
commit06583274fa64ad6677773bf4ca54f69226388203 (patch)
tree66354bf972d267bf7ee5135eb7e5b90c31f9fe4d /commitquery/merge_bases.go
parentformat/commitgraph/read: Lifetime (diff)
signatureNo signature
commitquery: Make a reusable engine thingy
Diffstat (limited to 'commitquery/merge_bases.go')
-rw-r--r--commitquery/merge_bases.go6
1 files changed, 3 insertions, 3 deletions
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
}