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

---
 receivepack/hooks/reject_force_push.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'receivepack')

diff --git a/receivepack/hooks/reject_force_push.go b/receivepack/hooks/reject_force_push.go
index cf5ddaea..4bc749a5 100644
--- a/receivepack/hooks/reject_force_push.go
+++ b/receivepack/hooks/reject_force_push.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/ancestor"
+	"codeberg.org/lindenii/furgit/commitquery"
 	"codeberg.org/lindenii/furgit/objectid"
 	objectmix "codeberg.org/lindenii/furgit/objectstore/mix"
 	receivepack "codeberg.org/lindenii/furgit/receivepack"
@@ -46,7 +46,7 @@ func RejectForcePush() receivepack.Hook {
 				continue
 			}
 
-			ok, err := ancestor.Is(objects, nil, current.ID, update.NewID)
+			ok, err := commitquery.New(objects, nil).IsAncestor(current.ID, update.NewID)
 			if err != nil {
 				return nil, fmt.Errorf("check fast-forward %s: %w", update.Name, err)
 			}
-- 
cgit v1.3.1-10-gc9f91