Skip to content

Commit

Permalink
Change indentation, add comment, use "git switch -c" instead of "git …
Browse files Browse the repository at this point in the history
…checkout -b"
  • Loading branch information
cpina committed Apr 30, 2023
1 parent 33585ea commit cbe757f
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,14 @@ git config --global user.name "$USER_NAME"
{
git clone --single-branch --depth 1 --branch "$TARGET_BRANCH" "$GIT_CMD_REPOSITORY" "$CLONE_DIR"
} || {
if [ "$CREATE_TARGET_BRANCH_IF_NEEDED" = 'true' ] ; then
git clone --single-branch --depth 1 "$GIT_CMD_REPOSITORY" "$CLONE_DIR"
else
false
fi
if [ "$CREATE_TARGET_BRANCH_IF_NEEDED" = "true" ]
then
# Default branch of the repository is cloned. Later on the required branch
# will be created
git clone --single-branch --depth 1 "$GIT_CMD_REPOSITORY" "$CLONE_DIR"
else
false
fi
} || {
echo "::error::Could not clone the destination repository. Command:"
echo "::error::git clone --single-branch --branch $TARGET_BRANCH $GIT_CMD_REPOSITORY $CLONE_DIR"
Expand Down Expand Up @@ -145,8 +148,9 @@ echo "[+] Set directory is safe ($CLONE_DIR)"
git config --global --add safe.directory "$CLONE_DIR"


if [ "$CREATE_TARGET_BRANCH_IF_NEEDED" = 'true' ] ; then
git checkout -b "$TARGET_BRANCH"
if [ "$CREATE_TARGET_BRANCH_IF_NEEDED" = "true" ]
then
git switch -c "$TARGET_BRANCH"
fi

echo "[+] Adding git commit"
Expand Down

0 comments on commit cbe757f

Please sign in to comment.