From 23660545fd51e43385fe8a949de8fd59c7c5cf5b Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Tue, 10 Aug 2021 10:11:21 +0200 Subject: [PATCH] fix: gitea repositories backup --- cluster/apps/development/gitea/backup-job.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cluster/apps/development/gitea/backup-job.yaml b/cluster/apps/development/gitea/backup-job.yaml index f93711dda..249818850 100644 --- a/cluster/apps/development/gitea/backup-job.yaml +++ b/cluster/apps/development/gitea/backup-job.yaml @@ -53,8 +53,12 @@ spec: if [ -d "$WORK_DIR/$org/$repo" ]; then echo "INFO: pull $org/$repo..." cd $WORK_DIR/$org/$repo - git reset --hard - git pull + git remote show origin -n | grep -c main &> /dev/null && MAIN_BRANCH="main" || MAIN_BRANCH="master" + git fetch --all + test $? -ne 0 && exit 1 + git reset --hard origin/$MAIN_BRANCH + test $? -ne 0 && exit 1 + git pull origin $MAIN_BRANCH test $? -ne 0 && exit 1 echo "INFO: clean $org/$repo..." git fetch --prune