From 9d29b04101b21b46d2bff041065308abd1ed31ca Mon Sep 17 00:00:00 2001 From: Jason Yuen Date: Sat, 5 Mar 2022 23:07:20 -0500 Subject: [PATCH] Compare i18n changes with correct branch (#1884) Co-authored-by: Quantum --- .github/workflows/updatemessages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/updatemessages.yml b/.github/workflows/updatemessages.yml index 67b46e092d..42a48bd10e 100644 --- a/.github/workflows/updatemessages.yml +++ b/.github/workflows/updatemessages.yml @@ -64,12 +64,13 @@ jobs: - name: Remove useless changes run: | set -eu + i18n_head=$(git rev-parse --verify -q origin/update-i18n || echo "HEAD") while IFS= read -r -d $'\0' file; do if git diff -s --exit-code "$file"; then continue fi - if git diff "$file" | tail -n +5 2>/dev/null | grep -qP '^[-+](?!"PO-Revision-Date:|"POT-Creation-Date:)'; then + if git diff "$i18n_head" -- "$file" | tail -n +5 2>/dev/null | grep -qP '^[-+](?!"PO-Revision-Date:|"POT-Creation-Date:)'; then echo "Changed: $file" else echo "No material change: $file"