honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix assumed aliases in rebase-pr script (#37050) 

The local rebase-pr script assumes the existence of specific git
aliases.  Instead this script should rely on the full written out
command instead.

PR Close #37050
This commit is contained in:
Joey Perrott 2020-05-11 11:41:33 -07:00 committed by Misko Hevery
parent 14c0ec97d8
commit 7d3f5043e1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/github/rebase-pr
View File

@ -29,9 +29,9 @@ echo Rebasing $USER_GIT_URL branch $BRANCH onto $REBASE_ON
echo ===================================================== echo =====================================================
git fetch $USER_GIT_URL $BRANCH git fetch $USER_GIT_URL $BRANCH
git co FETCH_HEAD git checkout FETCH_HEAD
PUSH_CMD="git push $USER_GIT_URL HEAD:$BRANCH -f"; PUSH_CMD="git push $USER_GIT_URL HEAD:$BRANCH -f";
RESTORE_CMD="git co $OLD_BRANCH" RESTORE_CMD="git checkout $OLD_BRANCH"
git rebase upstream/master git rebase upstream/master
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
$PUSH_CMD $PUSH_CMD