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

fix: nil pointer panic on NewIntFromBigInt (backport #9627) #9633

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 5, 2021

This is an automatic backport of pull request #9627 done by Mergify.
Cherry-pick of 7f90374 has failed:

On branch mergify/bp/release/v0.43.x/pr-9627
Your branch is up to date with 'origin/release/v0.43.x'.

You are currently cherry-picking commit 7f9037490.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   types/int.go
	modified:   types/int_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 7f90374)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Jul 5, 2021
@amaury1093
Copy link
Contributor

@fedekunze Could you fix the conflicts here?

@fedekunze
Copy link
Collaborator

@AmauryM done

Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

thanks!

@amaury1093
Copy link
Contributor

Feel free to approve yourself too. And then I can merge

@fedekunze fedekunze added A:automerge Automatically merge PR once all prerequisites pass. and removed conflicts labels Jul 6, 2021
@amaury1093
Copy link
Contributor

It has been decided in #9634 that this is a protocol-breaking change, so I don't think we should backport it. Is this fine by you @fedekunze ?

@amaury1093 amaury1093 closed this Jul 9, 2021
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.43.x/pr-9627 branch July 9, 2021 09:12
@fedekunze
Copy link
Collaborator

sure

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants