aboutsummaryrefslogtreecommitdiff
path: root/receivepack
diff options
context:
space:
mode:
authorGravatar Runxi Yu2026-03-11 20:41:32 +0800
committerGravatar Runxi Yu2026-03-11 20:41:32 +0800
commit040b572d95e4ca27e1ada6113c405b8a1eb4a669 (patch)
tree68d826f4d91144105802c9d1c67175ba9b314e29 /receivepack
parentresearch: Maybe drop mmap in packfile_bloom (diff)
signatureNo signature
commitquery: Merge from ancestor and mergebases
Diffstat (limited to 'receivepack')
-rw-r--r--receivepack/hooks/reject_force_push.go4
1 files changed, 2 insertions, 2 deletions
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)
}