From 040b572d95e4ca27e1ada6113c405b8a1eb4a669 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 11 Mar 2026 20:41:32 +0800 Subject: commitquery: Merge from ancestor and mergebases --- mergebase/base.go | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 mergebase/base.go (limited to 'mergebase/base.go') diff --git a/mergebase/base.go b/mergebase/base.go deleted file mode 100644 index 278fbed2..00000000 --- a/mergebase/base.go +++ /dev/null @@ -1,30 +0,0 @@ -package mergebase - -import ( - commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read" - "codeberg.org/lindenii/furgit/objectid" - "codeberg.org/lindenii/furgit/objectstore" -) - -// Base reports one merge base between left and right, if any. -// -// Both inputs are peeled through annotated tags before commit traversal. -func Base( - store objectstore.Store, - graph *commitgraphread.Reader, - left objectid.ObjectID, - right objectid.ObjectID, -) (objectid.ObjectID, bool, error) { - query := Query(store, graph, left, right) - - bases, err := query.All() - 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