File tree 2 files changed +12
-4
lines changed
2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -93,10 +93,17 @@ main() {
93
93
94
94
$CMD git add . && $CMD git commit -am " chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE "
95
95
96
- CURRENT_BRANCH=$( git branch | grep ' \*' | cut -d' ' -f2-)
97
96
# Note: we need to set upstream as well or the gh pr create step will fail
98
97
# See: https://github.com/cli/cli/issues/575
99
- $CMD git push -u origin " $CURRENT_BRANCH
98
+ CURRENT_BRANCH=$( git branch | grep ' \*' | cut -d' ' -f2-)
99
+ if [[ -z $( git config " branch.${CURRENT_BRANCH} .remote" ) ]]; then
100
+ echo " Doesn't look like you've pushed this branch to remote"
101
+ echo -e " Pushing now using: git push origin $CURRENT_BRANCH \n"
102
+ # Note: we need to set upstream as well or the gh pr create step will fail
103
+ # See: https://github.com/cli/cli/issues/575
104
+ echo " Please set the upstream and re-run the script"
105
+ exit 1
106
+ fi
100
107
101
108
# This runs from the root so that's why we use this path vs. ../../
102
109
RELEASE_TEMPLATE_STRING=$( cat ./.github/PULL_REQUEST_TEMPLATE/release_template.md)
Original file line number Diff line number Diff line change @@ -82,12 +82,13 @@ main() {
82
82
# If we don't do this, the opening a draft PR step won't work
83
83
# because it will stop and ask where you want to push the branch
84
84
CURRENT_BRANCH=$( git branch | grep ' \*' | cut -d' ' -f2-)
85
- if [[ -z $( git ls-remote --heads origin " $ CURRENT_BRANCH" ) ]]; then
85
+ if [[ -z $( git config " branch. ${ CURRENT_BRANCH} .remote " ) ]]; then
86
86
echo " Doesn't look like you've pushed this branch to remote"
87
87
echo -e " Pushing now using: git push origin $CURRENT_BRANCH \n"
88
88
# Note: we need to set upstream as well or the gh pr create step will fail
89
89
# See: https://github.com/cli/cli/issues/575
90
- git push -u origin " $CURRENT_BRANCH "
90
+ echo " Please set the upstream and re-run the script"
91
+ exit 1
91
92
fi
92
93
93
94
echo " Going to try to update vscode for you..."
You can’t perform that action at this time.
0 commit comments