aboutsummaryrefslogtreecommitdiff
path: root/mergebase/mergebase.go
diff options
context:
space:
mode:
authorGravatar Runxi Yu2026-03-07 16:43:13 +0800
committerGravatar Runxi Yu2026-03-07 16:43:59 +0800
commit7d6c80d1540f8bc06bc6a31086b3723bed7c95db (patch)
treef0f46fd35fed61a24b4fc1b2d1557b81bea9b26a /mergebase/mergebase.go
parentinternal/commitquery: paintDown only paints, don't collect (diff)
signatureNo signature
mergebase: No fake iterator API first and idempotency
Diffstat (limited to 'mergebase/mergebase.go')
-rw-r--r--mergebase/mergebase.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/mergebase/mergebase.go b/mergebase/mergebase.go
index dc0bcf6c..f61debc4 100644
--- a/mergebase/mergebase.go
+++ b/mergebase/mergebase.go
@@ -7,13 +7,14 @@ import (
"codeberg.org/lindenii/furgit/objectstore"
)
-// Bases is one iterator merge-base query.
+// Bases is one merge-base query over two commit roots.
type Bases struct {
store objectstore.Store
graph *commitgraphread.Reader
left objectid.ObjectID
right objectid.ObjectID
- seqUsed bool
- err error
+ computed bool
+ bases []objectid.ObjectID
+ err error
}