repo: Upgrade: use branch or commit

jrotkiewicz · jrotkiewicz · commit 32a0b393ce53 · 2021-10-08T07:34:36.000+02:00
diff --git a/newt/repo/repo.go b/newt/repo/repo.go
@@ -323,6 +323,10 @@ func (r *Repo) Upgrade(ver newtutil.RepoVersion) error {
 		return err
 	}
 
+	if branch := r.downloader.MainBranch(); branch != "" {
+		commit = branch
+	}
+
 	if err := r.updateRepo(commit); err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,10 @@ func (r *Repo) Upgrade(ver newtutil.RepoVersion) error {`
`323`	`323`	`return err`
`324`	`324`	`}`
`325`	`325`
	`326`	`+ if branch := r.downloader.MainBranch(); branch != "" {`
	`327`	`+ commit = branch`
	`328`	`+ }`
	`329`	`+`
`326`	`330`	`if err := r.updateRepo(commit); err != nil {`
`327`	`331`	`return err`
`328`	`332`	`}`