feat(base-branch): add base branch parameter

davinkevin · Jul 22, 2024 · 3b7152c · 3b7152c
1 parent 396864d
commit 3b7152c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -48,9 +48,10 @@ type UserConfig struct {
 	StatusBitsHeader bool `default:"true" yaml:"statusBitsHeader"`
 	StatusBitsEmojis bool `default:"true" yaml:"statusBitsEmojis"`
 
-	CreateDraftPRs       bool `default:"false" yaml:"createDraftPRs"`
-	PreserveTitleAndBody bool `default:"false" yaml:"preserveTitleAndBody"`
-	NoRebase             bool `default:"false" yaml:"noRebase"`
+	CreateDraftPRs       bool   `default:"false" yaml:"createDraftPRs"`
+	PreserveTitleAndBody bool   `default:"false" yaml:"preserveTitleAndBody"`
+	NoRebase             bool   `default:"false" yaml:"noRebase"`
+	BranchPrefix         string `default:"spr" yaml:"branchPrefix"`
 }
 
 type InternalState struct {

diff --git a/git/helpers.go b/git/helpers.go
@@ -26,7 +26,8 @@ func GetLocalBranchName(gitcmd GitInterface) string {
 
 func BranchNameFromCommit(cfg *config.Config, commit Commit) string {
 	remoteBranchName := cfg.Repo.GitHubBranch
-	return "spr/" + remoteBranchName + "/" + commit.CommitID
+	branchPrefix := cfg.User.BranchPrefix
+	return branchPrefix + "/" + remoteBranchName + "/" + commit.CommitID
 }
 
 var BranchNameRegex = regexp.MustCompile(`spr/([a-zA-Z0-9_\-/\.]+)/([a-f0-9]{8})$`)