Commit 7935c19d authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova

Fix in CreateWorkspace

Previously, the script attempted to directly merge ${merge}, which could f
ail if the branch was not already available locally. This update explicitly
fetches the branch from origin and then merges FETCH_HEAD with --ff, ensuring
the merge works even when the branch is missing locally.
parent 6193d7c7
...@@ -22,5 +22,5 @@ git config user.name "OAI Jenkins" ...@@ -22,5 +22,5 @@ git config user.name "OAI Jenkins"
git config advice.detachedHead false git config advice.detachedHead false
mkdir -p cmake_targets/log mkdir -p cmake_targets/log
git checkout -f ${ref} git checkout -f ${ref}
[ -n "${merge}" ] && git merge --ff ${merge} -m "Temporary merge for CI" [ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
exit 0 exit 0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment