Tackle feedback

go-git · Apr 14, 2023 · 7d77599 · 7d77599
1 parent 8048eac
commit 7d77599
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/url/url.go b/internal/url/url.go
@@ -5,7 +5,9 @@ import (
 )
 
 var (
-	isSchemeRegExp   = regexp.MustCompile(`^[^:]+://`)
+	isSchemeRegExp = regexp.MustCompile(`^[^:]+://`)
+
+	// Ref: https://github.com/git/git/blob/master/Documentation/urls.txt#L37
 	scpLikeUrlRegExp = regexp.MustCompile(`^(?:(?P<user>[^@]+)@)?(?P<host>[^:\s]+):(?:(?P<port>[0-9]{1,5}):)?(?P<path>[^\\].*)$`)
 )
 

diff --git a/internal/url/url_test.go b/internal/url/url_test.go
@@ -13,12 +13,13 @@ type URLSuite struct{}
 var _ = Suite(&URLSuite{})
 
 func (s *URLSuite) TestMatchesScpLike(c *C) {
+	// See https://github.com/git/git/blob/master/Documentation/urls.txt#L37
 	examples := []string{
 		// Most-extended case
 		"git@github.com:james/bond",
 		// Most-extended case with port
 		"git@github.com:22:james/bond",
-		// Most-extended case with numeric "username"
+		// Most-extended case with numeric path
 		"git@github.com:007/bond",
 		// Most-extended case with port and numeric "username"
 		"git@github.com:22:007/bond",
@@ -28,6 +29,11 @@ func (s *URLSuite) TestMatchesScpLike(c *C) {
 		"git@github.com:22:bond",
 		// Single repo path with port and numeric repo
 		"git@github.com:22:007",
+		// Repo path ending with .git and starting with _
+		"git@github.com:22:_007.git",
+		"git@github.com:_007.git",
+		"git@github.com:_james.git",
+		"git@github.com:_james/bond.git",
 	}
 
 	for _, url := range examples {