diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index e6a4328e3c4..91af1f1a3c1 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -10,7 +10,7 @@ case "$tip" in *) tip="${tip%% *}" ;; esac -base="$(git merge-base FETCH_HEAD "$tip")" +base="$(git merge-base origin/HEAD "$tip")" [ $(git rev-list --count "$tip" "^$base") -lt 200 ] || { echo "::error title=Branch out of date::Your branch is too out of date. Please rebase on upstream and force-push."