cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: force upstream fetch before merge (#21192)

Browse Source 
PR Close #21192
This commit is contained in:
Miško Hevery
2017-12-27 15:04:51 -08:00
parent 9f538a6cac
commit bc7a6d7b00
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/github/merge-pr
View File

@ -67,17 +67,20 @@ else
fi
CHERRY_PICK_PR="git cherry-pick upstream/pr/$PR_NUMBER~$PR_SHA_COUNT..upstream/pr/$PR_NUMBER"
FETCH_PR="git fetch https://github.com/angular/angular.git pull/$PR_NUMBER/head:angular/pr/$PR_NUMBER"
CHERRY_PICK_PR="git cherry-pick angular/pr/$PR_NUMBER~$PR_SHA_COUNT..angular/pr/$PR_NUMBER"
REWRITE_MESSAGE="git filter-branch -f --msg-filter \"$BASEDIR/utils/github_closes.js $PR_NUMBER\" HEAD~$PR_SHA_COUNT..HEAD"
echo "======================"
echo "GitHub Merge PR Steps"
echo "======================"
echo " $FETCH_PR"
echo " $CHERRY_PICK_PR"
echo " $REWRITE_MESSAGE"
echo "----------------------"
echo ">>> Cherry Pick: $CHERRY_PICK_PR"
$FETCH_PR
$CHERRY_PICK_PR
echo