From fd438f6b1d82ad797769fdad4fa6c46a791d6893 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 4 Feb 2024 14:50:26 +0100 Subject: [PATCH] fixed pre-push hook --- .githooks/pre-push | 4 ++-- .github/workflows/enforce-changelog.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.githooks/pre-push b/.githooks/pre-push index 5f84212..d6a3ebf 100644 --- a/.githooks/pre-push +++ b/.githooks/pre-push @@ -2,7 +2,7 @@ command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'pre-push' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; } git lfs pre-push "$@" -if ! git status -s | grep -q "M Changelog.md"; then - echo "The changelog was not updated. Please document your changes in Changelog.md before pushing." +if ! git diff origin --name-status | grep -E -q "M\s+CHANGELOG.md"; then + echo "The changelog was not updated. Please document your changes in CHANGELOG.md before pushing." exit 1 fi diff --git a/.github/workflows/enforce-changelog.yml b/.github/workflows/enforce-changelog.yml index 2d74a30..94ac6c4 100644 --- a/.github/workflows/enforce-changelog.yml +++ b/.github/workflows/enforce-changelog.yml @@ -7,5 +7,5 @@ jobs: with: changeLogPath: CHANGELOG.md missingUpdateErrorMessage: | - The changelog was not updated. Please document your changes in Changelog.md. + The changelog was not updated. Please document your changes in CHANGELOG.md. Run `git config core.hooksPath .githooks` to enable a git hook that ensures you updated the changelog before pushing.