From e726d8182254847bf1cf8b39d35ffcaa0f9f860e Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Wed, 3 Jan 2018 14:14:33 -0800 Subject: [PATCH] build: force fetch PR in merge script (#21295) Use `-f` when doing `git fetch` for the PR. Without it the `git fetch` will not overwrite what is currently fetched locally, in essence doing fast-forward only. PR Close #21295 --- scripts/github/merge-pr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/github/merge-pr b/scripts/github/merge-pr index 871811053c..24d286d13b 100755 --- a/scripts/github/merge-pr +++ b/scripts/github/merge-pr @@ -67,7 +67,7 @@ else fi -FETCH_PR="git fetch https://github.com/angular/angular.git pull/$PR_NUMBER/head:angular/pr/$PR_NUMBER" +FETCH_PR="git fetch https://github.com/angular/angular.git pull/$PR_NUMBER/head:angular/pr/$PR_NUMBER -f" 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"