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/validate.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ref/name/validate.go')

diff --git a/ref/name/validate.go b/ref/name/validate.go
index 989858b1..2c524491 100644
--- a/ref/name/validate.go
+++ b/ref/name/validate.go
@@ -20,7 +20,7 @@ func checkOrSanitizeRefname(name string, flags int, sanitized *strings.Builder)
 
 	if name == "@" {
 		if sanitized == nil {
-			return &NameError{Name: name, Reason: "single @ is not allowed"}
+			return fmt.Errorf("%w: single @ is not allowed", ErrInvalidName)
 		}
 
 		sanitized.WriteByte('-')
@@ -31,7 +31,7 @@ func checkOrSanitizeRefname(name string, flags int, sanitized *strings.Builder)
 			sanitized.WriteByte('/')
 		}
 
-		componentLen, err := checkRefnameComponent(remaining, &flags, sanitized, name)
+		componentLen, err := checkRefnameComponent(remaining, &flags, sanitized)
 		switch {
 		case sanitized != nil && componentLen == 0:
 		case componentLen <= 0:
@@ -39,7 +39,7 @@ func checkOrSanitizeRefname(name string, flags int, sanitized *strings.Builder)
 				return err
 			}
 
-			return &NameError{Name: name, Reason: "component has zero length"}
+			return fmt.Errorf("%w: component has zero length", ErrInvalidName)
 		case err != nil:
 			return err
 		}
@@ -56,12 +56,12 @@ func checkOrSanitizeRefname(name string, flags int, sanitized *strings.Builder)
 	componentLen := len(remaining)
 	if componentLen > 0 && remaining[componentLen-1] == '.' {
 		if sanitized == nil {
-			return &NameError{Name: name, Reason: "name ends with '.'"}
+			return fmt.Errorf("%w: name ends with '.'", ErrInvalidName)
 		}
 	}
 
 	if flags&nameAllowOneLevel == 0 && componentCount < 2 {
-		return &NameError{Name: name, Reason: "one-level name is not allowed"}
+		return fmt.Errorf("%w: one-level name is not allowed", ErrInvalidName)
 	}
 
 	return nil
-- 
cgit v1.3.1-10-gc9f91