chore: merge forward script fails when branch is already checked out #10946
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
The [AutoPullRequest] CodeBuild job already checks out the base branch. This causes the `git checkout -b` command to fail since the branch already exists. Update the script so that branch creation occurs only if it does not already exist. [AutoPullRequest]: https://github.com/aws/cdk-ops/blob/21acd7ff37ad9ab14d8c3f9b41980e9f62f64503/lib/cdk-pipeline.ts#L284-L290
|
|
RomainMuller
approved these changes
Oct 19, 2020
njlynch
reviewed
Oct 19, 2020
scripts/merge-forward.sh
Outdated
|
|
||
| # create 'v2-main' if it does not already exist | ||
| (git branch --list | grep 'v2-main') || git checkout -b v2-main origin/v2-main |
There was a problem hiding this comment.
If I'm reading the man page right, this is exactly what '-B' is made to do. https://git-scm.com/docs/git-checkout
Suggested change
| (git branch --list | grep 'v2-main') || git checkout -b v2-main origin/v2-main | |
| git checkout -B v2-main origin/v2-main |
There was a problem hiding this comment.
You're right. I seem to have missed that in the man page.
njlynch
approved these changes
Oct 19, 2020
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
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.
The AutoPullRequest CodeBuild job already checks out the base branch.
This causes the
git checkout -bcommand to fail since the branchalready exists.
Update the script so that branch creation occurs only if it does not
already exist.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license