diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76e1abb4a6a5a68d5a2271a03ba0a575164d1795..8e811cb37254d6a372f2ecbfef2f88f5d6e5b96d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,8 +82,13 @@ changelog-update:
     - apk add --no-cache python3 git
     - python3 --version
     - git version
-    - git fetch origin main
-    - git log --oneline "${CI_MERGE_REQUEST_DIFF_BASE_SHA}.." --
+    - git fetch --depth 16 origin main
+    - |
+      if ! git log --oneline "${CI_MERGE_REQUEST_DIFF_BASE_SHA}.." --; then
+        echo "Failed to find revision ${CI_MERGE_REQUEST_DIFF_BASE_SHA}.." >&2
+        echo "This likely means that you need to rebase your branch." >&2
+        exit 1
+      fi
     - python3 .forgejo/workflows/check-changelog.py
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'