aniani/tea
1
0
Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2024-11-03 04:27:21 -05:00
Code

Accept more main branch names for login detection (#396)

Browse Source 
Also consider `main` and `trunk` as options
to determine a login through its configured remote

fixes #381

Co-authored-by: Norwin <git@nroo.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/396
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-by: Alexey 〒erentyev <axifive@noreply.gitea.io>
Co-authored-by: Norwin <noerw@noreply.gitea.io>
Co-committed-by: Norwin <noerw@noreply.gitea.io>
This commit is contained in:
Norwin 2021-09-14 14:59:11 +08:00 committed by Andrew Thornton
parent 808e8b1c5a
commit 6e728cf812
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
} }
} }
} }