Skip merge commits #375
Merged
Skip merge commits #375
+107
−9
Conversation
This file contains 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
Merge commits cannot be cherry-picked unless a mainline is specified. In other to add the skip merge commit behavior as an input, we need to have a way to remove the merge commits from the shas to cherry pick. We can use git rev-list --merged to list the merge commits in a commit range. Since we don't have a range but an array of commits, we can build the shorthand for the range as the `first^..last`.
We must keep the behavior similar for users that haven't configured to skip merge commits. However, we can help the user by informing them why the backport failed and what they can do to recover. Especially, nudging the user towards the new config option to skip merge commits.
Adds the ability to configure skipping or failing merge commits. Note that this does not yet add an input to set this configuration.
Used to set the commits.merge_commits config setting which either fails the backport when the action encounters merge commits on the merged pull request, or skips any merge commits when cherry-picking. Misconfiguration fails the workflow run because this requires attention from the workflow owner. The fail setting fails the backport as described in the README, i.e. the action reports on its success or failure through a comment on the merged pull request. Perhaps in a future version I'll support failing the workflow run on failing a backport, but for now I'll keep that out of scope.
korthout
force-pushed
the
skipMergeCommits
branch
2 times, most recently
from
8faaefc to
110cfbc
Compare
korthout
force-pushed
the
skipMergeCommits
branch
from
110cfbc to
6e2244c
Compare
This was referenced Aug 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds a new input
merge_commitsthat specifies how the action should deal with merge commits on the merged pull request. It supports two settings:failfails the backport (default)skipexcludes the merge commits from the commits to cherry-pickcloses #373