gitea/tea
gitea/tea
56
129
Fork 64
Code Issues 97 Pull Requests 17 Actions Releases 16 Activity

Accept more main branch names for login detection #396

Merged
zeripath merged 1 commits from noerw/tea:more-main-branches into master 2021-09-14 06:59:12 +00:00
Conversation 0 Commits 1 Files Changed 1 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/context/context.go
View File

@ -166,10 +166,14 @@ func contextFromLocalRepo(repoPath, remoteValue string) (*git.TeaRepo, *config.L
} }
if len(gitConfig.Remotes) > 1 { if len(gitConfig.Remotes) > 1 {
// if master branch is present, use it as the default remote // if master branch is present, use it as the default remote
masterBranch, ok := gitConfig.Branches["master"] mainBranches := []string{"main", "master", "trunk"}
if ok { for _, b := range mainBranches {
if len(masterBranch.Remote) > 0 { masterBranch, ok := gitConfig.Branches[b]
remoteValue = masterBranch.Remote if ok {
if len(masterBranch.Remote) > 0 {
remoteValue = masterBranch.Remote
}
break
} }
} }
} }