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

Comment about unsupported merge strategies #47

Merged
merged 6 commits into from
May 28, 2021

Conversation

korthout
Copy link
Owner

This adds a simple check to make sure both the headref and the baseref commits are available to the action.
If they are not, the action will fail and make a comment on the original merged pull request.

Example comment:

Backport failed for `stable/0.25`, because 1 or more of the commits are not available.

Please cherry-pick the changes locally.
Note that rebase and squash merges are not supported at this time.
For more information see #46.

relates to #46

korthout added 6 commits May 28, 2021 21:05
Personally, I have gpgsign enabled at a global config setting. Running
the setup script locally would then try to use my gpg signature, which
caused some issues. I'd rather just disable signing the test setup
commits for now.
cat-file can be used to check whether a commit sha is available.
@korthout
Copy link
Owner Author

korthout commented May 28, 2021

The reference in the comment that is made by the bot to the original issue, would provide a good insight into how often users run into this problem.

@korthout korthout merged commit fe30eec into master May 28, 2021
@korthout korthout deleted the comment-unsupported-merge-strategies branch July 26, 2021 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant