Skip to content

Commit 19183e1

Browse files
Merge pull request #157 from FLuzzi-csw/fluzzi/support_default_main
support default branch "main"
2 parents 69b428b + 1943093 commit 19183e1

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

core/gitWrapper/git.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@ func initSubmodules(dep models.Dependency, repository *git.Repository) {
4949

5050
}
5151

52-
func GetMaster(repository *git.Repository) *config.Branch {
53-
54-
if branch, err := repository.Branch("master"); err != nil {
55-
return nil
56-
} else {
57-
return branch
52+
func GetMaster(repository *git.Repository) (*config.Branch, error) {
53+
branch, err := repository.Branch("master")
54+
if err != nil {
55+
branch, err = repository.Branch("main")
5856
}
57+
return branch, err
5958
}
6059

6160
func GetVersions(repository *git.Repository) []*plumbing.Reference {

core/installer/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func ensureModules(rootLock models.PackageLock, pkg *models.Package, deps []mode
113113
worktree, _ := repository.Worktree()
114114

115115
if !hasMatch {
116-
if masterReference := gitWrapper.GetMaster(repository); masterReference != nil {
116+
if masterReference, err := gitWrapper.GetMaster(repository); err == nil {
117117
referenceName = plumbing.NewBranchReferenceName(masterReference.Name)
118118
}
119119
} else {

0 commit comments

Comments
 (0)