Skip to content

Commit

Permalink
Update entrypoint.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
plumbis authored Mar 21, 2020
1 parent d009c78 commit da2d82b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -e

echo
echo " 'Nightly Merge Action' is using the following input:"
echo " - source_branch = '$SOURCE_BRANCH'"
echo " - target_branch = '$TARGET_BRANCH'"
echo " - source_branch = '$INPUT_SOURCE_BRANCH'"
echo " - target_branch = '$INPUT_TARGET_BRANCH'"
echo " - allow_ff = $INPUT_ALLOW_FF"
echo " - allow_git_lfs = $INPUT_GIT_LFS"
echo " - ff_only = $INPUT_FF_ONLY"
Expand Down Expand Up @@ -49,12 +49,12 @@ git config --global user.email "$INPUT_USER_EMAIL"

set -o xtrace

git checkout $TARGET_BRANCH
git checkout $INPUT_TARGET_BRANCH

git fetch

# Do the merge
git merge origin/$SOURCE_BRANCH
git merge origin/$INPUT_SOURCE_BRANCH

# Push the branch
git push

0 comments on commit da2d82b

Please sign in to comment.