From c002ddcf48f390dc2b9bb4ec6c1992f47b265162 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 25 Jul 2022 10:21:45 +0800 Subject: [PATCH] fix fatal: remote upstream already exists. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d383372c4..ed3bf4b57f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ variables: export TARGET_REF="${CI_COMMIT_BEFORE_SHA}" export SOURCE_REF="${CI_COMMIT_SHA}" else - git remote add upstream https://gitlab.com/fdroid/fdroiddata.git + 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 SOURCE_REF="${CI_COMMIT_SHA}"