diff --git a/Makefile b/Makefile index 2cc8d5a576..67f6c3dab1 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ export DOCKER_GITCOMMIT # against these are used in hack/validate/.validate to check what changed in the PR. export VALIDATE_REPO export VALIDATE_BRANCH +export VALIDATE_ORIGIN_BRANCH # env vars passed through directly to Docker's build scripts # to allow things like `make KEEPBUNDLE=1 binary` easily @@ -54,6 +55,7 @@ DOCKER_ENVS := \ -e TIMEOUT \ -e VALIDATE_REPO \ -e VALIDATE_BRANCH \ + -e VALIDATE_ORIGIN_BRANCH \ -e HTTP_PROXY \ -e HTTPS_PROXY \ -e NO_PROXY \ diff --git a/hack/validate/.validate b/hack/validate/.validate index acc985d41b..6ed3a59a73 100644 --- a/hack/validate/.validate +++ b/hack/validate/.validate @@ -11,8 +11,11 @@ if [ -z "$VALIDATE_UPSTREAM" ]; then VALIDATE_HEAD="$(git rev-parse --verify HEAD)" - git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH" - VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)" + if [ -z "$VALIDATE_ORIGIN_BRANCH" ]; then + git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH" + VALIDATE_ORIGIN_BRANCH=FETCH_HEAD + fi + VALIDATE_UPSTREAM="$(git rev-parse --verify $VALIDATE_ORIGIN_BRANCH)" VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD" VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"