Skip to content

Commit cf60e7d

Browse files
authored
Merge pull request #4633 from dlabrecq/script3
Update -u flag for release-app-interface script
2 parents 9c190ce + 7c31d1d commit cf60e7d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

scripts/release-app-interface.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ mergeRequest()
158158
push()
159159
{
160160
echo ""
161-
read -p "*** You are pushing to the $TARGET_BRANCH branch. Continue?" YN
161+
read -p "*** You are pushing to the $SOURCE_BRANCH branch. Continue?" YN
162162

163163
case $YN in
164164
[Yy]* ) echo "\n*** Pushing $SOURCE_BRANCH..."; git push -u origin $SOURCE_BRANCH;;

scripts/release-branch.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,15 @@ pullRequest()
9999

100100
push()
101101
{
102+
NEW_BRANCH="release_${TARGET_BRANCH}.$$"
103+
104+
git branch -m $NEW_BRANCH
105+
102106
echo ""
103-
read -p "*** You are pushing to the $TARGET_BRANCH branch. Continue?" YN
107+
read -p "*** You are pushing to the $NEW_BRANCH branch. Continue?" YN
104108

105109
case $YN in
106-
[Yy]* ) echo "\n*** Pushing $TARGET_BRANCH..."; git push -u origin $TARGET_BRANCH;;
110+
[Yy]* ) echo "\n*** Pushing $NEW_BRANCH..."; git push -u origin $NEW_BRANCH;;
107111
[Nn]* ) exit 0;;
108112
* ) echo "Please answer yes or no."; push;;
109113
esac

0 commit comments

Comments
 (0)