From fbc52ffa6fa955fd0af688943aa09bb7843238f1 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 28 Jul 2022 21:56:29 +0800
Subject: [PATCH] Fix finding the common ancestor of two branch

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4622530ca..af63b673ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ variables:
     else
         git remote add upstream https://gitlab.com/fdroid/fdroiddata.git || true
         git fetch upstream ${CI_DEFAULT_BRANCH}
-        export TARGET_REF=$(git merge-base --fork-point upstream/${CI_DEFAULT_BRANCH})
+        export TARGET_REF=$(git merge-base HEAD upstream/${CI_DEFAULT_BRANCH})
         export SOURCE_REF="${CI_COMMIT_SHA}"
     fi;