Skip merge commits in suggestion #397
Merged
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
This compose for backport script failure method was a remnant from when this action used a shell script to perform the git commands. Most reasons were dead code.
The manual instructions still suggested to determine the commits to cherry-pick by determining the common ancestor (merge-base) of the head and base refs, first. However, this way has been abandoned for quite some time now. This especially became a problem now that merge commits can be skipped, meaning that the suggestion no longer produced a reliable result. Instead, we can simply suggest the same as the action does. It knows exactly which commits to cherry-pick.
When the cherr-picking failed, it's very likely that there are conflicts. We should instruct the user to cherry-pick locally and resolve any conflicts.
The switch command has been around for 4 years now, and while still marked as experimental, I think it's fine to "switch" to it in the suggestion for local cherry-picking. It's unlikely that users are using such old git versions that it doesn't support git switch --create.
korthout
force-pushed
the
395-skip-merge-commits-in-suggestion
branch
from
30f2a3e
to
19a4042
Compare
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.
This makes several small improvements to the local cherry-picking suggestions:
git merge-baseto determine the commits to cherry-pickgit switch --createrather thangit checkout --branchas it may be easier to understandResolves #395
Example
Before this pull request
After this pull request