From 30127fcc3c17f0455a51193ce565a99c93462d5d Mon Sep 17 00:00:00 2001 From: jorenbroekema Date: Sun, 18 Oct 2020 14:26:33 +0200 Subject: [PATCH] fix: add commit and push logic after git add logic --- entrypoint.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 90db9c1..b9f430d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -48,6 +48,17 @@ if _git_changed; then else # Calling method to configure the git environemnt _git_setup + + if $INPUT_ONLY_CHANGED; then + for file in $(git diff --name-only HEAD^..HEAD) + do + git add $file + done + else + # Add changes to git + git add "${INPUT_FILE_PATTERN}" || echo "Problem adding your files with pattern ${INPUT_FILE_PATTERN}" + fi + # Commit and push changes back if $INPUT_SAME_COMMIT; then echo "Amending the current commit..." @@ -55,15 +66,6 @@ if _git_changed; then git commit --amend --no-edit git push origin -f else - if $INPUT_ONLY_CHANGED; then - for file in $(git diff --name-only HEAD^..HEAD) - do - git add $file - done - else - # Add changes to git - git add "${INPUT_FILE_PATTERN}" || echo "Problem adding your files with pattern ${INPUT_FILE_PATTERN}" - fi git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"} || echo "No files added to commit" git push origin fi