Merge pull request #157 from FLuzzi-csw/fluzzi/support_default_main

support default branch "main"
HashLoad · Feb 26, 2024 · 19183e1 · 19183e1
2 parents 69b428b + 1943093
commit 19183e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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 {