Fix error if create-target-branch-if-needed is used and the target br…

…anch already existed
cpina · May 19, 2023 · b2e2c48 · b2e2c48
1 parent d63a102
commit b2e2c48
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -149,7 +149,11 @@ git config --global --add safe.directory "$CLONE_DIR"
 if [ "$CREATE_TARGET_BRANCH_IF_NEEDED" = "true" ]
 then
     echo "[+] Switch to the TARGET_BRANCH"
-    git switch -c "$TARGET_BRANCH"
+    # || true: if the $TARGET_BRANCH already existed in the destination repo:
+    # it is already the current branch and it cannot be switched to
+    # (it's not needed)
+    # If the branch did not exist: it switches (creating) the branch
+    git switch -c "$TARGET_BRANCH" || true
 fi
 
 echo "[+] Adding git commit"