plumbing: Fix invalid reference name error while cloning branches containing /- (#1257)

varmakarthik12 · web-flow · commit 62a77b7d343d · 2024-12-20T08:52:59.000Z
* plumbing: Fix invalid reference name error while cloning branches containing /-

* Tests
diff --git a/plumbing/reference.go b/plumbing/reference.go
@@ -188,7 +188,7 @@ func (r ReferenceName) Validate() error {
 
 	isBranch := r.IsBranch()
 	isTag := r.IsTag()
-	for _, part := range parts {
+	for i, part := range parts {
 		// rule 6
 		if len(part) == 0 {
 			return ErrInvalidReferenceName
@@ -205,7 +205,7 @@ func (r ReferenceName) Validate() error {
 			return ErrInvalidReferenceName
 		}
 
-		if (isBranch || isTag) && strings.HasPrefix(part, "-") { // branches & tags can't start with -
+		if (isBranch || isTag) && strings.HasPrefix(part, "-") && (i == 2) { // branches & tags can't start with -
 			return ErrInvalidReferenceName
 		}
 	}
diff --git a/plumbing/reference_test.go b/plumbing/reference_test.go
@@ -115,6 +115,8 @@ func (s *ReferenceSuite) TestValidReferenceNames(c *C) {
 		"refs/pulls/1/abc.123",
 		"refs/pulls",
 		"refs/-", // should this be allowed?
+		"refs/ab/-testing",
+		"refs/123-testing",
 	}
 	for _, v := range valid {
 		c.Assert(v.Validate(), IsNil)

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func (r ReferenceName) Validate() error {`
`188`	`188`
`189`	`189`	`isBranch := r.IsBranch()`
`190`	`190`	`isTag := r.IsTag()`
`191`		`- for _, part := range parts {`
	`191`	`+ for i, part := range parts {`
`192`	`192`	`// rule 6`
`193`	`193`	`if len(part) == 0 {`
`194`	`194`	`return ErrInvalidReferenceName`
`@@ -205,7 +205,7 @@ func (r ReferenceName) Validate() error {`
`205`	`205`	`return ErrInvalidReferenceName`
`206`	`206`	`}`
`207`	`207`
`208`		`- if (isBranch \|\| isTag) && strings.HasPrefix(part, "-") { // branches & tags can't start with -`
	`208`	`+ if (isBranch \|\| isTag) && strings.HasPrefix(part, "-") && (i == 2) { // branches & tags can't start with -`
`209`	`209`	`return ErrInvalidReferenceName`
`210`	`210`	`}`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,8 @@ func (s ReferenceSuite) TestValidReferenceNames(c C) {`
`115`	`115`	`"refs/pulls/1/abc.123",`
`116`	`116`	`"refs/pulls",`
`117`	`117`	`"refs/-", // should this be allowed?`
	`118`	`+ "refs/ab/-testing",`
	`119`	`+ "refs/123-testing",`
`118`	`120`	`}`
`119`	`121`	`for _, v := range valid {`
`120`	`122`	`c.Assert(v.Validate(), IsNil)`