hack/cherry-pick.sh: add UPSTREAM_BRANCH, apply merge commits by default #20526
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
openshift-ci-robot
added
the
size/XS
sttts
changed the title
…OMMITS for old mode
sttts
force-pushed
the
sttts-cherry-pick-merge-commit-not-single-branch-commits
branch
from
7389420
to
9cb8cfe
Compare
sttts
changed the title
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: smarterclayton, sttts The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
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.
UPSTREAM_BRANCHis needed to tell the merge commit algorithm to find the merge on the right upstream branch. This is necessary to pick from non-master branches of kube.We now apply the merge commit (= the diff to its left parent), not single commits on the feature branch. The latter often fails because the branch point of the feature branch is often the wrong start of a commit range to apply. The merge commit instead is more stable. The old mode is available by setting
APPLY_PR_COMMITS=1.