Merge pull request #8779 from ministryofjustice/fix/git-commit-script

Graceful handling of git commit in `git-commit.sh`

scripts/git-commit.sh

@@ -17,16 +17,17 @@ commit_message="Workflow: created files in ${1}"
 
 git checkout -b "$branch"
 git add "$1"
-git commit -m "$commit_message"
 
-commit_success=$?
-if [ $commit_success -ne 0 ]; then
-  echo "Nothing to commit"
+# Check if there are any changes to commit
+if git diff-index --quiet HEAD --; then
+  echo "Nothing to commit, working tree clean"
   exit 0
 fi
 
+git commit -m "$commit_message"
+
 git remote rm origin || true
 git remote add origin "https://${TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
 git push -u origin "$branch"
 
-git status
+git status