Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(stack branch): Support renaming branches #54

Merged
merged 5 commits into from
Aug 5, 2022

Conversation

twavv
Copy link
Contributor

@twavv twavv commented Aug 5, 2022

This PR is a bit large because golangci-lint just released a new version (last night I think) that breaks our CI for some reason. I'm not entirely sure, but Go 1.19 introduced a small change to how doc comments are formatted when using gofmt and golangci-lint was complaining (in a rather opaque way) because it... is apparently trying to use that version of gofmt even though we're on Go 1.18? I couldn't really reproduce it with golangci-lint, but this change just runs the code from source directly. (Adding these kinds of things to tools.go is a pretty common practice and doesn't increase the size of our build executable or anything)

If you want to look at just the first commit, that might be easier since it contains all the actual code changes.

@twavv twavv requested review from a user and jainankit August 5, 2022 15:30
@twavv twavv marked this pull request as ready for review August 5, 2022 16:18
cmd/av/stack_branch.go Outdated Show resolved Hide resolved
return err
}

if !currentMeta.Parent.Trunk {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add comments describing this part. If I understand this correctly, we are setting the parent to point to the new branch as the child.

@aviator-app
Copy link
Contributor

aviator-app bot commented Aug 5, 2022

Aviator status

Aviator will automatically update this comment as the status of the PR changes.

This PR was merged using Aviator.

@aviator-app aviator-app bot merged commit 7cb82b4 into master Aug 5, 2022
@aviator-app aviator-app bot deleted the travis/mer-1022-av-cli-support-renaming-branch branch August 5, 2022 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants