Add script to facilitate cherry-picking from k/k #253
Merged
Conversation
This file contains hidden or 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
* Until legacy-cloud-provider is deleted, there is a possibility that bug fixes are merged into k/k before this respository. This script makes it easier to cherry-pick commits from there to here, which requires a path rewrite and is a pain to do by hand. This will probably stop being useful if the v1 provider in this repository diverges from the legacy provider in k/k, and we should encourage contributions to come here first.
k8s-ci-robot
added
release-note-none
nckturner
force-pushed
the
cherry-pick-script
branch
from
3315be4 to
aa29db1
Compare
k8s-ci-robot
added
the
size/M
k8s-ci-robot
added
the
approved
wongma7
reviewed
Aug 25, 2021
| popd > /dev/null | ||
|
|
||
| echo "Modifying paths in patch..." | ||
| sed -i "s|staging/src/k8s.io/legacy-cloud-providers/aws|pkg/providers/v1|g" "${patch_file}" |
There was a problem hiding this comment.
git can do this with -p and --directory btw https://stackoverflow.com/questions/931882/how-to-apply-a-git-patch-from-one-repository-to-another
Contributor
Author
There was a problem hiding this comment.
Ah, I tried --directory first which obviously didn't work due to the leading path, I'll have to give it a try with -p as well.
|
/lgtm |
k8s-ci-robot
added
the
lgtm
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nckturner, wongma7 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Until legacy-cloud-provider is deleted, there is a possibility that
bug fixes are merged into k/k before this respository. This script
makes it easier to cherry-pick commits from there to here, which
requires a path rewrite and is a pain to do by hand. This will
probably stop being useful if the v1 provider in this repository
diverges from the legacy provider in k/k, and we should encourage
contributions to come here first.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
Quick script to facilitate cherry picking and path rewriting from k/k