Merge pull request #1009 from pascalbreuninger/fix/at-symbol-in-sourc…

…e-repo fix(cli): allow @ symbol in git https host string
loft-sh · Apr 17, 2024 · 09beb31 · 09beb31
2 parents 3f7e9db + 60b2505
commit 09beb31
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/git/git.go b/pkg/git/git.go
@@ -21,10 +21,10 @@ const (
 )
 
 var (
-	branchRegEx      = regexp.MustCompile(`^([^@]*(?:git@)?[^@/]+/[^@/]+/?[^@/]+)@([a-zA-Z0-9\./\-\_]+)$`)
-	commitRegEx      = regexp.MustCompile(`^([^@]*(?:git@)?[^@/]+/[^@]+)` + regexp.QuoteMeta(CommitDelimiter) + `([a-zA-Z0-9]+)$`)
-	prReferenceRegEx = regexp.MustCompile(`^([^@]*(?:git@)?[^@/]+/[^@]+)@(` + PullRequestReference + `)$`)
-	subPathRegEx     = regexp.MustCompile(`^([^@]*(?:git@)?[^@/]+/[^@]+)` + regexp.QuoteMeta(SubPathDelimiter) + `([a-zA-Z0-9\./\-\_]+)$`)
+	branchRegEx      = regexp.MustCompile(`^([^@]*(?:git@)?@?[^@/]+/[^@/]+/?[^@/]+)@([a-zA-Z0-9\./\-\_]+)$`)
+	commitRegEx      = regexp.MustCompile(`^([^@]*(?:git@)?@?[^@/]+/[^@]+)` + regexp.QuoteMeta(CommitDelimiter) + `([a-zA-Z0-9]+)$`)
+	prReferenceRegEx = regexp.MustCompile(`^([^@]*(?:git@)?@?[^@/]+/[^@]+)@(` + PullRequestReference + `)$`)
+	subPathRegEx     = regexp.MustCompile(`^([^@]*(?:git@)?@?[^@/]+/[^@]+)` + regexp.QuoteMeta(SubPathDelimiter) + `([a-zA-Z0-9\./\-\_]+)$`)
 )
 
 func CommandContext(ctx context.Context, args ...string) *exec.Cmd {

diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go
@@ -151,6 +151,14 @@ func TestNormalizeRepository(t *testing.T) {
 			expectedCommit:      "",
 			expectedSubpath:     "/test/path",
 		},
+		{
+			in:                  "https://[email protected]/loft-sh/devpod.git@test-branch",
+			expectedRepo:        "https://[email protected]/loft-sh/devpod.git",
+			expectedPRReference: "",
+			expectedBranch:      "test-branch",
+			expectedCommit:      "",
+			expectedSubpath:     "",
+		},
 	}
 
 	for _, testCase := range testCases {