From edcc37406b8088796b5c81f8cf018dd1dcf4a1d8 Mon Sep 17 00:00:00 2001
From: Lord_Alfred <2259979+lord-alfred@users.noreply.github.com>
Date: Fri, 30 Jul 2021 00:24:49 +0300
Subject: [PATCH] improve commit in workflow

---
 .github/workflows/update.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 990a6ba0..7e5c83b1 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -51,14 +51,20 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail
-          git config --local user.email "$(git log --format='%ae' HEAD^!)"
-          git config --local user.name "$(git log --format='%an' HEAD^!)"
-          git remote add github "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
-          git pull github ${GITHUB_REF} --ff-only
+
+          # Get name & email from 1st commit
+          git config --local user.email "$(git log --format='%ae' --reverse | head -1)"
+          git config --local user.name "$(git log --format='%an' --reverse | head -1)"
+
+          # try commit
           git add .
           if [ -z "$(git status --porcelain)" ]; then
             echo 'No changes'
             exit 0
           fi
-          git commit -m "Update ip ranges"
+          git commit -m "Auto-update ip ranges"
+
+          # push changes
+          git remote add github "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
+          git pull github ${GITHUB_REF} --ff-only
           git push github HEAD:${GITHUB_REF}