From 41e45d38f2d1ec78881f7e0ce778b2f43fed80a2 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 6 Jun 2026 21:51:58 +0000 Subject: ref/name, object: Simplify errors --- ref/name/update.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ref/name/update.go') diff --git a/ref/name/update.go b/ref/name/update.go index d29afe4b..a87165a4 100644 --- a/ref/name/update.go +++ b/ref/name/update.go @@ -1,11 +1,14 @@ package name -import "strings" +import ( + "fmt" + "strings" +) // ValidateUpdateName checks whether name is valid for a direct ref update. func ValidateUpdateName(name string, hasNewValue bool) error { if IsPseudo(name) { - return &NameError{Name: name, Reason: "pseudoref updates are not allowed"} + return fmt.Errorf("%w: pseudoref updates are not allowed", ErrInvalidName) } if hasNewValue { @@ -13,7 +16,7 @@ func ValidateUpdateName(name string, hasNewValue bool) error { } if !IsSafe(name) { - return &NameError{Name: name, Reason: "unsafe name for update"} + return fmt.Errorf("%w: unsafe name for update", ErrInvalidName) } return nil @@ -23,7 +26,7 @@ func ValidateUpdateName(name string, hasNewValue bool) error { func ValidateSymbolicTarget(name string, target string) error { parsed := ParseWorktree(name) if parsed.BareRefName == "HEAD" && !strings.HasPrefix(target, "refs/heads/") { - return &NameError{Name: target, Reason: name + " must point to refs/heads/..."} + return fmt.Errorf("%w: %s must point to refs/heads/...", ErrInvalidName, name) } if IsRoot(target) { @@ -43,5 +46,5 @@ func ValidateSymbolicTarget(name string, target string) error { return nil } - return &NameError{Name: target, Reason: "symref target is not a ref"} + return fmt.Errorf("%w: symref target is not a ref", ErrInvalidName) } -- cgit v1.3.1-10-gc9f91