actions
/
tea
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer origin if there are multiple remotes (#458) 

Usually, `origin` is the name of a default remote, which corresponds with upstream. This change improves remote selection when non of `main`, `master` nor `trunk` local branches is present.

Co-authored-by: Petr Vaněk <arkamar@atlas.cz>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: https://gitea.com/gitea/tea/pulls/458
Reviewed-by: 6543 <6543@obermui.de>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: arkamar <arkamar@noreply.gitea.io>
Co-committed-by: arkamar <arkamar@noreply.gitea.io>
This commit is contained in:
arkamar 2022-03-09 09:35:51 +08:00 committed by 6543
parent 0e24009fe9
commit fb3e1f75e9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/context/context.go
View File

@ -164,6 +164,11 @@ func contextFromLocalRepo(repoPath, remoteValue string) (*git.TeaRepo, *config.L
remoteValue = remote remoteValue = remote
} }
if len(gitConfig.Remotes) > 1 { if len(gitConfig.Remotes) > 1 {
// prefer origin if there is multiple remotes
_, ok := gitConfig.Remotes["origin"]
if ok {
remoteValue = "origin"
}
// if master branch is present, use it as the default remote // if master branch is present, use it as the default remote
mainBranches := []string{"main", "master", "trunk"} mainBranches := []string{"main", "master", "trunk"}
for _, b := range mainBranches { for _, b := range mainBranches {