From e03c2dcf5794acdb2f6de3c145917d57d0da7505 Mon Sep 17 00:00:00 2001
From: proletarius101 <proletarius101@protonmail.com>
Date: Sun, 24 Jul 2022 09:25:28 +0000
Subject: [PATCH] [ci] check diff with common ancestor

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa372c6540..5d383372c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,8 +46,9 @@ variables:
         export TARGET_REF="${CI_COMMIT_BEFORE_SHA}"
         export SOURCE_REF="${CI_COMMIT_SHA}"
     else
-        git fetch https://gitlab.com/fdroid/fdroiddata.git $CI_DEFAULT_BRANCH
-        export TARGET_REF="FETCH_HEAD"
+        git remote add upstream https://gitlab.com/fdroid/fdroiddata.git
+        git fetch upstream ${CI_DEFAULT_BRANCH}
+        export TARGET_REF=$(git merge-base --fork-point upstream/${CI_DEFAULT_BRANCH})
         export SOURCE_REF="${CI_COMMIT_SHA}"
     fi;