From 8acdc3c8c4b8195174e89914fc981a890a3062e7 Mon Sep 17 00:00:00 2001 From: Martin Mulholland <71444914+mmulholla@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:32:50 -0400 Subject: [PATCH] complete bad fix (#492) --- make/test.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/make/test.mk b/make/test.mk index cf8768a8..514c82fe 100644 --- a/make/test.mk +++ b/make/test.mk @@ -112,12 +112,10 @@ ifeq ($(E2E_REPO_PATH),"") if [[ -n "${REMOTE_E2E_BRANCH}" ]]; then \ git config --global user.email "devtools@redhat.com"; \ git config --global user.name "Devtools"; \ - # retrieve the branch name \ - BRANCH_NAME=`echo ${BRANCH_REF} | awk -F'/' '{print $$3}'`; \ # add the user's fork as remote repo \ git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} remote add external ${AUTHOR_LINK}/toolchain-e2e.git; \ # fetch the branch \ - git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} fetch external ${BRANCH_REF}; \ + git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} fetch external ${REMOTE_E2E_BRANCH}; \ # merge the branch with master \ git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} merge --allow-unrelated-histories --no-commit FETCH_HEAD; \ fi;