Merge pull request #5 from Toilal/local-branch-support

Fix issue when local branch already exists (actions/checkout@v2 support)
robotology · Jan 13, 2021 · 4047e51 · 4047e51
2 parents 63ff174 + a567b84
commit 4047e51
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -45,10 +45,10 @@ git config --global user.email "$INPUT_USER_EMAIL"
 set -o xtrace
 
 git fetch origin $INPUT_STABLE_BRANCH
-git checkout -b $INPUT_STABLE_BRANCH origin/$INPUT_STABLE_BRANCH
+(git checkout $INPUT_STABLE_BRANCH && git pull)||git checkout -b $INPUT_STABLE_BRANCH origin/$INPUT_STABLE_BRANCH
 
 git fetch origin $INPUT_DEVELOPMENT_BRANCH
-git checkout -b $INPUT_DEVELOPMENT_BRANCH origin/$INPUT_DEVELOPMENT_BRANCH
+(git checkout $INPUT_DEVELOPMENT_BRANCH && git pull)||git checkout -b $INPUT_DEVELOPMENT_BRANCH origin/$INPUT_DEVELOPMENT_BRANCH
 
 if git merge-base --is-ancestor $INPUT_STABLE_BRANCH $INPUT_DEVELOPMENT_BRANCH; then
   echo "No merge is necessary"