From 8f0848dc35c7d7ccadbc29cce78ee849480d33da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 17 Aug 2018 11:50:40 +0200
Subject: [PATCH] Blender's benchmark submodule should be on the correct branch

This forces the release/scripts/benchmark submodule to be on the same
branch as the working directory of the bundle script (usually release-xxx).
---
 bundle/bundle-linux.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bundle/bundle-linux.sh b/bundle/bundle-linux.sh
index f69ed1d..5f44921 100755
--- a/bundle/bundle-linux.sh
+++ b/bundle/bundle-linux.sh
@@ -278,6 +278,13 @@ ${GIT_C} pull
 echo "Updatying submodules to the latest version..."
 ${GIT_C} submodule update --remote --init --recursive
 
+
+# The release/scripts/benchmark submodule should be on the correct branch (usually release-xxx)
+BM_BRANCH=$(${GIT} -C ${SCRIPTPATH} rev-parse --abbrev-ref HEAD)
+echo "Forcing release/scripts/benchmark to $BM_BRANCH branch..."
+${GIT} -C ${SOURCE_DIRECTORY}/release/scripts/benchmark checkout ${BM_BRANCH}
+
+
 if [ "${KERNEL_NAME}" == "Darwin" ]; then
   # Get precompiled libs
   cd "${SOURCE_DIRECTORY}"