From e5952c49588844f564ff23cebfdc1960bb7bf0b4 Mon Sep 17 00:00:00 2001
From: proletarius101 <proletarius101@protonmail.com>
Date: Sun, 1 Oct 2023 16:40:16 +0000
Subject: [PATCH] Resolve "fatal: couldn't find remote ref xxx/master"

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d980218299..d5a907176a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,8 @@ variables:
         export SOURCE_REF="${CI_COMMIT_SHA}"
     else
         git remote add upstream https://gitlab.com/fdroid/fdroiddata.git || true
-        git fetch upstream ${CI_DEFAULT_BRANCH}
-        export TARGET_REF=$(git merge-base HEAD upstream/${CI_DEFAULT_BRANCH})
+        git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-master}
+        export TARGET_REF=$(git merge-base HEAD upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-master})
         export SOURCE_REF="${CI_COMMIT_SHA}"
     fi;