refactor code and fix comments

antoooks · Dec 3, 2023 · 1985f47 · 1985f47
1 parent 0833270
commit 1985f47
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/cmd/gorepomod/internal/git/runner.go b/cmd/gorepomod/internal/git/runner.go
@@ -171,12 +171,12 @@ func (gr *Runner) LoadRemoteTags(
 
 	// Update latest tags from upstream
 	gr.comment("updating tags from upstream")
-	_, err = gr.run(noHarmDone, "fetch", "-t", string(remoteUpstream), "master")
+	_, err = gr.run(noHarmDone, "fetch", "-t", string(remoteUpstream), string(mainBranch))
 	if err != nil {
 		// Handle if repo is not a fork
-		_, err = gr.run(noHarmDone, "fetch", "-t", "master")
+		_, err = gr.run(noHarmDone, "fetch", "-t", string(mainBranch))
 		if err != nil {
-			_ = fmt.Errorf("failed to fetch tags from master")
+			_ = fmt.Errorf("failed to fetch tags from %s", string(mainBranch))
 		}
 	}
 
@@ -381,3 +381,7 @@ func (gr *Runner) GetLatestTag(releaseBranch string) (string, error) {
 
 	return latestTag, nil
 }
+
+func (gr *Runner) GetMainBranch() string {
+	return string(mainBranch)
+}
diff --git a/cmd/gorepomod/internal/repo/dotgitdata.go b/cmd/gorepomod/internal/repo/dotgitdata.go
@@ -195,7 +195,9 @@ func getLocalPrefix(dgAbsPath string) string {
 		fmt.Errorf("failed extracting git information: %q", err.Error())
 	}
 
-	var originUrlString string = string(out)
-	var localPrefix string = utils.ParseGitRepositoryPath(originUrlString)
+	localPrefix := utils.ParseGitRepositoryPath(string(out))
+	if len(localPrefix) == 0 {
+		fmt.Errorf("parsed git repository path is empty: %q", err.Error())
+	}
 	return localPrefix
 }
diff --git a/cmd/gorepomod/internal/utils/utils.go b/cmd/gorepomod/internal/utils/utils.go
@@ -56,16 +56,16 @@ func ParseGitRepositoryPath(urlString string) string {
 
 	var repoPath string
 
-	// for ssh protocol git@github.com:path/repo.git
+	// TODO(antoooks): Confirm if we should handle other formats not commonly supported by Github
 	switch protocol {
+	// ssh protocol, e.g. git@github.com:path/repo.git
 	case "git":
 		repoPath = strings.Join(d[2:len(d)-1], "/") + "/" + d[3][:len(d[3])-4]
-		// https protocol https://github.com/path/repo.git
+	// https protocol, e.g. https://github.com/path/repo.git
 	case "https":
 		repoPath = strings.Join(d[2:], "/")
 		repoPath = repoPath[:len(repoPath)-4]
-		// unsupported format
-		// TODO: confirm if we should handle other formats not commonly supported by Github
+	// unsupported format
 	default:
 		_ = fmt.Errorf("protocol format is not supported: %s", protocol)
 		return ""

diff --git a/cmd/gorepomod/main.go b/cmd/gorepomod/main.go
@@ -76,7 +76,7 @@ func actualMain() error {
 		v := args.Version()
 		// Update branch history
 		gr := git.NewQuiet(mgr.AbsPath(), args.DoIt(), false)
-		gr.FetchRemote("master")
+		gr.FetchRemote(misc.TrackedRepo(gr.GetMainBranch()))
 
 		if v.IsZero() {
 			// Always use latest tag while does not removing manual usage capability