From 1943093e13316a61dbca1d7407b00df3b1d67676 Mon Sep 17 00:00:00 2001 From: FLuzzi-csw Date: Thu, 22 Feb 2024 11:34:19 +0100 Subject: [PATCH] support default branch "main" --- core/gitWrapper/git.go | 11 +++++------ core/installer/core.go | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/gitWrapper/git.go b/core/gitWrapper/git.go index 29788ca..3f35b89 100644 --- a/core/gitWrapper/git.go +++ b/core/gitWrapper/git.go @@ -49,13 +49,12 @@ func initSubmodules(dep models.Dependency, repository *git.Repository) { } -func GetMaster(repository *git.Repository) *config.Branch { - - if branch, err := repository.Branch("master"); err != nil { - return nil - } else { - return branch +func GetMaster(repository *git.Repository) (*config.Branch, error) { + branch, err := repository.Branch("master") + if err != nil { + branch, err = repository.Branch("main") } + return branch, err } func GetVersions(repository *git.Repository) []*plumbing.Reference { diff --git a/core/installer/core.go b/core/installer/core.go index c860083..ed3395a 100644 --- a/core/installer/core.go +++ b/core/installer/core.go @@ -113,7 +113,7 @@ func ensureModules(rootLock models.PackageLock, pkg *models.Package, deps []mode worktree, _ := repository.Worktree() if !hasMatch { - if masterReference := gitWrapper.GetMaster(repository); masterReference != nil { + if masterReference, err := gitWrapper.GetMaster(repository); err == nil { referenceName = plumbing.NewBranchReferenceName(masterReference.Name) } } else {