fix fatal: remote upstream already exists.

This commit is contained in:
linsui 2022-07-25 10:21:45 +08:00 committed by linsui
parent 3c9284e4a8
commit c002ddcf48

View file

@ -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}"