From 7553a3e89c5aeab93124a832713672013ddcbcd4 Mon Sep 17 00:00:00 2001
From: Aussiemon <1407091-Aussiemon@users.noreply.gitlab.com>
Date: Fri, 2 Jan 2026 03:07:09 -0700
Subject: [PATCH 1/4] Fetch --unshallow in ubuntu_gcc_preprocess.sh

---
 CI/ubuntu_gcc_preprocess.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/ubuntu_gcc_preprocess.sh b/CI/ubuntu_gcc_preprocess.sh
index d519d178aa..82ac65409a 100755
--- a/CI/ubuntu_gcc_preprocess.sh
+++ b/CI/ubuntu_gcc_preprocess.sh
@@ -56,9 +56,9 @@ if [[ "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]]; then
     git remote add source "${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}"
     git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
 elif [[ "${CI_COMMIT_BRANCH}" ]]; then
-    git fetch origin "${CI_COMMIT_BRANCH:?}"
+    git fetch --unshallow origin "${CI_COMMIT_BRANCH:?}"
 else
-    git fetch origin
+    git fetch --unshallow origin
 fi
 
 BASE_VERSION=$(git merge-base "target/${TARGET_BRANCH:?}" "${VERSION:?}")

From 9c82709ab393e1d84dc20578b562649209f4940b Mon Sep 17 00:00:00 2001
From: Aussiemon <1407091-Aussiemon@users.noreply.gitlab.com>
Date: Fri, 2 Jan 2026 04:18:56 -0700
Subject: [PATCH 2/4] Check for shallowness before unshallow

---
 CI/ubuntu_gcc_preprocess.sh | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/CI/ubuntu_gcc_preprocess.sh b/CI/ubuntu_gcc_preprocess.sh
index 82ac65409a..fc3c59d171 100755
--- a/CI/ubuntu_gcc_preprocess.sh
+++ b/CI/ubuntu_gcc_preprocess.sh
@@ -50,15 +50,34 @@ git remote add target "${CI_MERGE_REQUEST_PROJECT_URL:-https://gitlab.com/OpenMW
 
 TARGET_BRANCH="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-master}"
 
-git fetch target "${TARGET_BRANCH:?}"
+# Use unshallow to prevent error with git-merge-base: https://stackoverflow.com/a/78596539/22975246
+if [[ "$(git rev-parse --is-shallow-repository)" == "true" ]]; then
+    REPO_IS_SHALLOW=true 
+    git fetch --unshallow target "${TARGET_BRANCH:?}"
+else
+    REPO_IS_SHALLOW=false
+    git fetch target "${TARGET_BRANCH:?}"
+fi
 
 if [[ "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]]; then
     git remote add source "${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}"
-    git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
+    if $REPO_IS_SHALLOW; then
+        git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
+    else
+        git fetch source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
+    fi
 elif [[ "${CI_COMMIT_BRANCH}" ]]; then
-    git fetch --unshallow origin "${CI_COMMIT_BRANCH:?}"
+    if $REPO_IS_SHALLOW; then
+        git fetch --unshallow origin "${CI_COMMIT_BRANCH:?}"
+    else
+        git fetch origin "${CI_COMMIT_BRANCH:?}"
+    fi
 else
-    git fetch --unshallow origin
+    if $REPO_IS_SHALLOW; then
+        git fetch --unshallow origin
+    else
+        git fetch origin
+    fi
 fi
 
 BASE_VERSION=$(git merge-base "target/${TARGET_BRANCH:?}" "${VERSION:?}")

From c123bbad55f0a7d97f8ee4905ca59c70d1147274 Mon Sep 17 00:00:00 2001
From: Aussiemon <1407091-Aussiemon@users.noreply.gitlab.com>
Date: Fri, 2 Jan 2026 04:35:28 -0700
Subject: [PATCH 3/4] Just check both

---
 CI/ubuntu_gcc_preprocess.sh | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/CI/ubuntu_gcc_preprocess.sh b/CI/ubuntu_gcc_preprocess.sh
index fc3c59d171..6a6600bb22 100755
--- a/CI/ubuntu_gcc_preprocess.sh
+++ b/CI/ubuntu_gcc_preprocess.sh
@@ -51,33 +51,15 @@ git remote add target "${CI_MERGE_REQUEST_PROJECT_URL:-https://gitlab.com/OpenMW
 TARGET_BRANCH="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-master}"
 
 # Use unshallow to prevent error with git-merge-base: https://stackoverflow.com/a/78596539/22975246
-if [[ "$(git rev-parse --is-shallow-repository)" == "true" ]]; then
-    REPO_IS_SHALLOW=true 
-    git fetch --unshallow target "${TARGET_BRANCH:?}"
-else
-    REPO_IS_SHALLOW=false
-    git fetch target "${TARGET_BRANCH:?}"
-fi
+git fetch --unshallow target "${TARGET_BRANCH:?}" || git fetch target "${TARGET_BRANCH:?}"
 
 if [[ "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]]; then
     git remote add source "${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}"
-    if $REPO_IS_SHALLOW; then
-        git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
-    else
-        git fetch source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
-    fi
+    git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ||  git fetch source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
 elif [[ "${CI_COMMIT_BRANCH}" ]]; then
-    if $REPO_IS_SHALLOW; then
-        git fetch --unshallow origin "${CI_COMMIT_BRANCH:?}"
-    else
-        git fetch origin "${CI_COMMIT_BRANCH:?}"
-    fi
+    git fetch --unshallow origin "${CI_COMMIT_BRANCH:?}" || git fetch origin "${CI_COMMIT_BRANCH:?}"
 else
-    if $REPO_IS_SHALLOW; then
-        git fetch --unshallow origin
-    else
-        git fetch origin
-    fi
+    git fetch --unshallow origin || git fetch origin
 fi
 
 BASE_VERSION=$(git merge-base "target/${TARGET_BRANCH:?}" "${VERSION:?}")

From b043f7267c3c5088e11a07573f0736b9f75198a3 Mon Sep 17 00:00:00 2001
From: Aussiemon <1407091-Aussiemon@users.noreply.gitlab.com>
Date: Fri, 2 Jan 2026 04:48:54 -0700
Subject: [PATCH 4/4] =?UTF-8?q?Extra=20space=20=F0=9F=98=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CI/ubuntu_gcc_preprocess.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/ubuntu_gcc_preprocess.sh b/CI/ubuntu_gcc_preprocess.sh
index 6a6600bb22..ed4e4320b3 100755
--- a/CI/ubuntu_gcc_preprocess.sh
+++ b/CI/ubuntu_gcc_preprocess.sh
@@ -55,7 +55,7 @@ git fetch --unshallow target "${TARGET_BRANCH:?}" || git fetch target "${TARGET_
 
 if [[ "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]]; then
     git remote add source "${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}"
-    git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ||  git fetch source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
+    git fetch --unshallow source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" || git fetch source "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
 elif [[ "${CI_COMMIT_BRANCH}" ]]; then
     git fetch --unshallow origin "${CI_COMMIT_BRANCH:?}" || git fetch origin "${CI_COMMIT_BRANCH:?}"
 else