NO-JIRA: fix: discard unstaged changes before rebase in sync_repo_and_patch#1872
NO-JIRA: fix: discard unstaged changes before rebase in sync_repo_and_patch#1872fracappa wants to merge 2 commits intoopenshift-metal3:masterfrom
Conversation
|
Hi @fracappa. Thanks for your PR. I'm waiting for a openshift-metal3 member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
01_install_requirements.sh patches metal3-dev-env/lib/common.sh in place with sed -i, leaving the tree dirty. On subsequent runs, sync_repo_and_patch fails to rebases because of the unstaged changes. Add git restore . before the rebase to start from a clean state.
abf5d99 to
06b1177
Compare
|
/ok-to-test |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bfournie The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test e2e-agent-compact-ipv4-iso-no-registry e2e-metal-ipi-ovn-dualstack |
|
@fracappa: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
01_install_requirements.shpatches metal3-dev-env/lib/common.sh in place withsed -i, leaving the tree dirty. On subsequent runs, sync_repo_and_patch fails to rebases because of the unstaged changes. Add git restore . before the rebase to start from a clean state.