fix(config): manage case with branch with multiple / in their names

Related to ejoffe#415
davinkevin · Jul 22, 2024 · a13d2c8 · a13d2c8
1 parent 3b7152c
commit a13d2c8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/config/config_parser/remote_branch.go b/config/config_parser/remote_branch.go
@@ -17,7 +17,7 @@ func NewRemoteBranchSource(gitcmd git.GitInterface) *remoteBranch {
 	}
 }
 
-var _remoteBranchRegex = regexp.MustCompile(`^## ([a-zA-Z0-9_\-/\.]+)\.\.\.([a-zA-Z0-9_\-/\.]+)/([a-zA-Z0-9_\-/\.]+)`)
+var _remoteBranchRegex = regexp.MustCompile(`^## ([a-zA-Z0-9_\-/\.]+)\.\.\.([a-zA-Z0-9_\-\.]+)/([a-zA-Z0-9_\-/\.]+)`)
 
 func (s *remoteBranch) Load(cfg interface{}) {
 	var output string
@@ -32,5 +32,7 @@ func (s *remoteBranch) Load(cfg interface{}) {
 	repoCfg := cfg.(*config.RepoConfig)
 
 	repoCfg.GitHubRemote = matches[2]
-	repoCfg.GitHubBranch = matches[3]
+	if repoCfg.GitHubBranch == "" {
+		repoCfg.GitHubBranch = matches[3]
+	}
 }