From 84026c23dc1a8abe7bb7d132f8916a6b4bafce03 Mon Sep 17 00:00:00 2001 From: VitoAlbano Date: Mon, 19 Aug 2024 12:05:19 +0100 Subject: [PATCH] [ci:force] - Script update permissions --- scripts/migration/export-commits.sh | 31 ++++++++++++----------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/scripts/migration/export-commits.sh b/scripts/migration/export-commits.sh index cac22337d67..8a11114632b 100755 --- a/scripts/migration/export-commits.sh +++ b/scripts/migration/export-commits.sh @@ -1,30 +1,25 @@ git fetch -git checkout ng16-migration +git checkout ng16-develop git pull --rebase git rebase origin/develop if [ $? -eq 0 ]; then - git push origin ng16-migration --force --no-verify - - git checkout ng16-develop - git reset --hard origin/develop + git push origin ng16-develop --force --no-verify git checkout ng16-migration - # git pull --rebase - # git rebase origin/develop + git reset --hard origin/ng16-migration - # if [ $? -eq 0 ]; then - # git push origin ng16-migration --force-with-lease --no-verify - # git checkout ng16-develop - # else - # echo -e "\e[31mThere was some error during rebasing of cherry-pick branch\e[0m" - # exit 1; - # fi - git cherry-pick --quit - echo -e "\e[34m===> Merge changes from cherry pick branch: ng15-cherry-pick-list\e[0m" - echo -e "git cherry-pick `git log --pretty=format:"%H" origin/develop..origin/ng15-cherry-pick-list --reverse` -x" - echo -e "\e[34m===> Cherry Picking complete \e[0m" + git checkout ng16-develop + if [ $? -eq 0 ]; then + git cherry-pick --quit + echo -e "\e[34m===> Merge changes from cherry pick branch: ng16-develop cherry pick list\e[0m" + echo -e "git cherry-pick `git log --pretty=format:"%H" origin/develop..origin/ng16-develop --reverse` -x" + echo -e "\e[34m===> Cherry Picking complete \e[0m" + else + echo -e "\e[31mThere was some error during cherry-picking of ng16-develop\e[0m" + exit 1; + fi else echo -e "\e[31mThere was some error during rebasing of develop-ng14\e[0m" exit 1;