repo: Upgrade: use branch or commit - #445
Open
jrotkiewicz wants to merge 1 commit into
Open
Conversation
utzig
reviewed
Oct 7, 2021
utzig
left a comment
utzig
left a comment
Member
There was a problem hiding this comment.
What is the issue this PR is trying to solve?
| if err != nil { | ||
| return err | ||
| } | ||
| if branch := r.downloader.MainBranch(); branch != "" { |
Member
There was a problem hiding this comment.
I believe you could just add if branch := r.downloader.MainBranch(); branch == "" { around the r.CommitFromVer call block, and avoid the r.updateRepo copypasta.
Author
There was a problem hiding this comment.
While doing newt upgrade the script tries to checkout to 'master' while there is 'main' instead. Now it is possible to use the 'branch: 'main'' in repository.yml file, and it doesn't only allow to fetch properly, but also to checkout.
About the code - you're right, sorry, I am new to 'go', maybe such solution would be better:
func (r *Repo) Upgrade(ver newtutil.RepoVersion) error {
commit, err := r.CommitFromVer(ver)
if err != nil {
return err
}
if branch := r.downloader.MainBranch(); branch != "" {
commit = branch
}
if err := r.updateRepo(commit); err != nil {
return err
}
return nil
}
Let me know. Thank you
Member
|
@jrotkiewicz Please rebase on latest master. |
jrotkiewicz
force-pushed
the
fix_naming
branch
from
October 8, 2021 05:36
f89a46b to
32a0b39
Compare
While doing newt upgrade the script tries to checkout
to 'master' while there is 'main' instead. Now it is possible
to use the 'branch: 'main'' in repository.yml file,
and it doesn't only allow to fetch properly, but also to checkout.
example from repository.yml:
repository.xyz:
type: git
vers: 0.0.0
branch: 'main'
url: 'git@github.com:xyz.git'
jrotkiewicz
force-pushed
the
fix_naming
branch
from
February 9, 2022 10:53
32a0b39 to
7923009
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.