From c4e0bcd525530a1664047d3965bc4d3ab37e12e1 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 17 Feb 2020 10:47:10 +0100 Subject: [PATCH] Update entrypoint.sh --- entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 45f67f1..217123d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -20,10 +20,6 @@ EOF # Calling method to configure the git environemnt git_setup -# The remote changes should already be fetched, but as there is #4 this could resolve the problem -git fetch -# Switch to the actual branch -git checkout $INPUT_BRANCH echo "Installing prettier..." npm install --silent --global prettier @@ -33,6 +29,10 @@ prettier $INPUT_PRETTIER_OPTIONS || echo "Problem while prettifying your files!" if ! git diff --quiet then echo "Commiting and pushing changes..." + # The remote changes should already be fetched, but as there is #4 this could resolve the problem + git fetch + # Switch to the actual branch + git checkout $INPUT_BRANCH # Add changes to git git add "${INPUT_FILE_PATTERN}" # Commit and push changes back