From 586c2a64a3d1e8cf7d58be1637895c4ec588e765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 10 Jan 2023 22:00:00 +0100 Subject: [PATCH] .github/workflows: compare PR branch to master Since 4410de52c1 we fetch all origin branches, and FETCH_HEAD can point elsewhere --- common/travis/changed_templates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index e6a4328e3c49..91af1f1a3c1a 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."