Skip to content

Create script for cherry picking to release branch#2234

Merged
copybara-service[bot] merged 3 commits intomainfrom
cherrypickscript
Jun 26, 2024
Merged

Create script for cherry picking to release branch#2234
copybara-service[bot] merged 3 commits intomainfrom
cherrypickscript

Conversation

@brettchabot
Copy link
Collaborator

No description provided.

Copy link

@AkshDesai04 AkshDesai04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we already fire a git status instead of telling the user to do so?

Copy link

@AkshDesai04 AkshDesai04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a call for git status ourselves would make it more functional.

if [[ -n $(git status -s) ]]; then
echo "Error: git directory is not clean; Running 'git status'"
git status
exit 1
fi

fi

if [[ ! "$RELEASE_BRANCH" =~ "release_branch" ]]; then
echo "Error: RELEASE_BRANCH env var is undefined or does not contain 'release_branch'"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

output the value to show which one?

Suggested change
echo "Error: RELEASE_BRANCH env var is undefined or does not contain 'release_branch'"
echo "Error: RELEASE_BRANCH env var (${RELEASE_BRANCH}) is undefined or does not contain 'release_branch'"

set -e

if [[ -n $(git status -s) ]]; then
echo "Error: git directory is not clean; check 'git status'"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
echo "Error: git directory is not clean; check 'git status'"
echo "Error: git directory is not clean; running 'git status'"
git status

@copybara-service copybara-service bot merged commit a12ef99 into main Jun 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants