From bb4a6369468e6a0e01dc8522fee7093f71c1886b Mon Sep 17 00:00:00 2001 From: Conrad Date: Sat, 17 Oct 2020 14:28:22 +0200 Subject: [PATCH] Attempt on bugfixing the new same_commit option --- entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/entrypoint.sh b/entrypoint.sh index 9b2eb5e..d8d1b9a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -61,6 +61,7 @@ if _git_changed; then # Commit and push changes back if $INPUT_SAME_COMMIT; then echo "Amending the current commit..." + git pull git commit --amend --no-edit else 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"