From 31f6ea6809c04599e2016565eee0e8ae255331c3 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 30 Mar 2026 20:01:38 +0000 Subject: network/receivepack/service: Some cleanups --- network/receivepack/service/apply.go | 4 ++-- network/receivepack/service/command.go | 10 ++-------- network/receivepack/service/hook_apply.go | 13 ------------- network/receivepack/service/run_hook.go | 11 ++++++++++- 4 files changed, 14 insertions(+), 24 deletions(-) (limited to 'network') diff --git a/network/receivepack/service/apply.go b/network/receivepack/service/apply.go index aae61340..8dcc004f 100644 --- a/network/receivepack/service/apply.go +++ b/network/receivepack/service/apply.go @@ -127,7 +127,7 @@ func successCommandResult(command Command) CommandResult { return CommandResult{ Name: command.Name, RefName: command.Name, - OldID: objectIDPointer(command.OldID), - NewID: objectIDPointer(command.NewID), + OldID: new(command.OldID), + NewID: new(command.NewID), } } diff --git a/network/receivepack/service/command.go b/network/receivepack/service/command.go index 4d234214..9ad50c4f 100644 --- a/network/receivepack/service/command.go +++ b/network/receivepack/service/command.go @@ -15,8 +15,8 @@ func fillCommandErrors(result *Result, commands []Command, errText string) { Name: command.Name, Error: errText, RefName: command.Name, - OldID: objectIDPointer(command.OldID), - NewID: objectIDPointer(command.NewID), + OldID: new(command.OldID), + NewID: new(command.NewID), }) } } @@ -24,9 +24,3 @@ func fillCommandErrors(result *Result, commands []Command, errText string) { func isDelete(command Command) bool { return command.NewID == command.NewID.Algorithm().Zero() } - -func objectIDPointer(id objectid.ObjectID) *objectid.ObjectID { - out := id - - return &out -} diff --git a/network/receivepack/service/hook_apply.go b/network/receivepack/service/hook_apply.go index 5bd8f596..97d25009 100644 --- a/network/receivepack/service/hook_apply.go +++ b/network/receivepack/service/hook_apply.go @@ -1,18 +1,5 @@ package service -func buildHookUpdates(commands []Command) []RefUpdate { - updates := make([]RefUpdate, 0, len(commands)) - for _, command := range commands { - updates = append(updates, RefUpdate{ - Name: command.Name, - OldID: command.OldID, - NewID: command.NewID, - }) - } - - return updates -} - func resultForHookRejection(command Command, message string) CommandResult { result := successCommandResult(command) result.Error = message diff --git a/network/receivepack/service/run_hook.go b/network/receivepack/service/run_hook.go index 1943dfd7..c8b1b76c 100644 --- a/network/receivepack/service/run_hook.go +++ b/network/receivepack/service/run_hook.go @@ -33,12 +33,21 @@ func (service *Service) runHook( utils.BestEffortFprintf(service.opts.Progress, "running hooks...\r") + updates := make([]RefUpdate, 0, len(commands)) + for _, command := range commands { + updates = append(updates, RefUpdate{ + Name: command.Name, + OldID: command.OldID, + NewID: command.NewID, + }) + } + decisions, err := service.opts.Hook(ctx, HookRequest{ Refs: service.opts.Refs, ExistingObjects: service.opts.ExistingObjects, QuarantinedObjects: quarantinedObjects, CommitGraph: service.opts.CommitGraph, - Updates: buildHookUpdates(commands), + Updates: updates, PushOptions: append([]string(nil), req.PushOptions...), IO: service.opts.HookIO, }) -- cgit v1.3.1-10-gc9f91