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: snapshot commands panic if snapshot don't exists (backport #16138) #16139

Merged
merged 3 commits into from
May 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2023

This is an automatic backport of pull request #16138 done by Mergify.
Cherry-pick of 92247cb has failed:

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

You are currently cherry-picking commit 92247cb0e.
  (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:   client/snapshot/dump.go
	modified:   snapshots/manager.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://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

(cherry picked from commit 92247cb)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner May 13, 2023 08:09
@mergify mergify bot added the conflicts label May 13, 2023
@github-actions github-actions bot added the C:CLI label May 13, 2023
@julienrbrt
Copy link
Member

We actually should just remove the changelog.

@@ -48,6 +49,10 @@ func DumpArchiveCmd() *cobra.Command {
return err
}

if snapshot == nil {
return errors.New("snapshot doesn't exist")
Copy link
Member

Choose a reason for hiding this comment

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

the wording still needs to be updated on main.

@julienrbrt julienrbrt enabled auto-merge (squash) May 13, 2023 09:00
@julienrbrt julienrbrt merged commit 55b3847 into release/v0.47.x May 13, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16138 branch May 13, 2023 09:20
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
…s#16138) (cosmos#16139)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
…s#16138) (cosmos#16139)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants