Fix: Annotations upgrade script #613
Merged
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
|
Verified that @pramodsum has signed the CLA. Thanks for the pull request! |
DanDeMicco
reviewed
Jan 31, 2018
build/upgrade_annotations.sh
Outdated
| git fetch github-upstream || return 1; | ||
|
|
||
| # Update to latest code on GitHub master | ||
| git checkout master || return 1 |
There was a problem hiding this comment.
Comment here is incorrect. Shouldnt this be reset --hard github-upstream/master ?
There was a problem hiding this comment.
Also side note you can look into the -e flag instead of the || return 1
DanDeMicco
reviewed
Feb 2, 2018
| # Fetch latest code | ||
| git fetch github-upstream || return 1; | ||
| git checkout master || return 1 | ||
|
|
||
| # The master branch should not have any commits | ||
| if [[ $(git log --oneline ...github-upstream/master) != "" ]] ; then | ||
| echo "----------------------------------------------------" |
There was a problem hiding this comment.
Change this error message to say something like you have extra commits in your master branch
DanDeMicco
approved these changes
Feb 6, 2018
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.
No description provided.